贷款提交

ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/DkCommonController.java

@@ -5,36 +5,82 @@ import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.system.domain.Dksq;
-import com.ruoyi.system.service.impl.DkCommonServerceImpl;
-import com.ruoyi.system.service.impl.DksqLcjlServiceImpl;
-import com.ruoyi.system.service.impl.DksqServiceImpl;
+import com.ruoyi.system.service.IDkCommonServerce;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @Author: tjf
  * @Date: 2023/6/15 15:27
  * @Describe:
  */
+@RestController
 @RequestMapping("/dkCommon")
 public class DkCommonController extends BaseController {
     @Autowired
-    private DkCommonServerceImpl dkCommonServerce;
+    private IDkCommonServerce dkCommonServerce;
+
+
+    /**
+     * 后台首页统计
+     */
+    @PostMapping("/index")
+    public AjaxResult index()
+    {
+        return dkCommonServerce.index();
+    }
+
+    /**
+     * 后台首页统计
+     * ECharts
+     */
+    @PostMapping("/eCharts")
+    public AjaxResult eCharts(@RequestBody Dksq dksq)
+    {
+        return dkCommonServerce.eCharts(dksq);
+    }
 
     /**
      * 劳动局审核
      */
-    @PreAuthorize("@ss.hasPermi('system:dksq:edit')")
-    @Log(title = "贷款申请_主", businessType = BusinessType.UPDATE)
+    @PreAuthorize("@ss.hasPermi('dkCommon:dksq:shenHe')")
     @PostMapping("/shenHe")
     public AjaxResult shenHe(@RequestBody Dksq dksq)
     {
         return dkCommonServerce.shenHe(dksq);
     }
 
+    /**
+     * 劳动局指派银行
+     */
+    @PreAuthorize("@ss.hasPermi('dkCommon:dksq:zhiPai')")
+    @PostMapping("/zhiPai")
+    public AjaxResult zhiPai(@RequestBody Dksq dksq)
+    {
+        return dkCommonServerce.zhiPai(dksq);
+    }
+
+    /**
+     * 银行评估材料
+     */
+    @PreAuthorize("@ss.hasPermi('dkCommon:dksq:pingGu')")
+    @PostMapping("/pingGu")
+    public AjaxResult pingGu(@RequestBody Dksq dksq)
+    {
+        return dkCommonServerce.pingGu(dksq);
+    }
 
+    /**
+     * 银行放贷
+     */
+    @PreAuthorize("@ss.hasPermi('dkCommon:dksq:fangDai')")
+    @PostMapping("/fangDai")
+    public AjaxResult fangDai(@RequestBody Dksq dksq)
+    {
+        return dkCommonServerce.fangDai(dksq);
+    }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java

@@ -93,7 +93,7 @@ public class CacheController
     }
 
     @PreAuthorize("@ss.hasPermi('monitor:cache:list')")
-    @DeleteMapping("/clearCacheName/{cacheName}")
+    @GetMapping("/clearCacheName/{cacheName}")
     public AjaxResult clearCacheName(@PathVariable String cacheName)
     {
         Collection<String> cacheKeys = redisTemplate.keys(cacheName + "*");
@@ -102,7 +102,7 @@ public class CacheController
     }
 
     @PreAuthorize("@ss.hasPermi('monitor:cache:list')")
-    @DeleteMapping("/clearCacheKey/{cacheKey}")
+    @GetMapping("/clearCacheKey/{cacheKey}")
     public AjaxResult clearCacheKey(@PathVariable String cacheKey)
     {
         redisTemplate.delete(cacheKey);
@@ -110,7 +110,7 @@ public class CacheController
     }
 
     @PreAuthorize("@ss.hasPermi('monitor:cache:list')")
-    @DeleteMapping("/clearCacheAll")
+    @GetMapping("/clearCacheAll")
     public AjaxResult clearCacheAll()
     {
         Collection<String> cacheKeys = redisTemplate.keys("*");

ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java

@@ -56,7 +56,7 @@ public class SysLogininforController extends BaseController
 
     @PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
     @Log(title = "登录日志", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{infoIds}")
+    @GetMapping("/delete/{infoIds}")
     public AjaxResult remove(@PathVariable Long[] infoIds)
     {
         return toAjax(logininforService.deleteLogininforByIds(infoIds));
@@ -64,7 +64,7 @@ public class SysLogininforController extends BaseController
 
     @PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
     @Log(title = "登录日志", businessType = BusinessType.CLEAN)
-    @DeleteMapping("/clean")
+    @GetMapping("/clean")
     public AjaxResult clean()
     {
         logininforService.cleanLogininfor();

ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java

@@ -52,7 +52,7 @@ public class SysOperlogController extends BaseController
 
     @Log(title = "操作日志", businessType = BusinessType.DELETE)
     @PreAuthorize("@ss.hasPermi('monitor:operlog:remove')")
-    @DeleteMapping("/{operIds}")
+    @GetMapping("/delete/{operIds}")
     public AjaxResult remove(@PathVariable Long[] operIds)
     {
         return toAjax(operLogService.deleteOperLogByIds(operIds));
@@ -60,7 +60,7 @@ public class SysOperlogController extends BaseController
 
     @Log(title = "操作日志", businessType = BusinessType.CLEAN)
     @PreAuthorize("@ss.hasPermi('monitor:operlog:remove')")
-    @DeleteMapping("/clean")
+    @GetMapping("/clean")
     public AjaxResult clean()
     {
         operLogService.cleanOperLog();

ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java

@@ -74,7 +74,7 @@ public class SysUserOnlineController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('monitor:online:forceLogout')")
     @Log(title = "在线用户", businessType = BusinessType.FORCE)
-    @DeleteMapping("/{tokenId}")
+    @GetMapping("/delete/{tokenId}")
     public AjaxResult forceLogout(@PathVariable String tokenId)
     {
         redisCache.deleteObject(CacheConstants.LOGIN_TOKEN_KEY + tokenId);

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/DkFjController.java

@@ -85,7 +85,7 @@ public class DkFjController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:fj:edit')")
     @Log(title = "贷款_附件", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PostMapping("/put")
     public AjaxResult edit(@RequestBody DkFj dkFj)
     {
         return toAjax(dkFjService.updateDkFj(dkFj));
@@ -96,7 +96,7 @@ public class DkFjController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:fj:remove')")
     @Log(title = "贷款_附件", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
+	@GetMapping("/delete/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
         return toAjax(dkFjService.deleteDkFjByIds(ids));

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/DksqController.java

@@ -62,7 +62,6 @@ public class DksqController extends BaseController
     /**
      * 获取贷款申请_主详细信息
      */
-    @PreAuthorize("@ss.hasPermi('system:dksq:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -72,7 +71,6 @@ public class DksqController extends BaseController
     /**
      * 新增贷款申请_主
      */
-    @PreAuthorize("@ss.hasPermi('system:dksq:add')")
     @Log(title = "贷款申请_主", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody Dksq dksq)
@@ -83,9 +81,8 @@ public class DksqController extends BaseController
     /**
      * 修改贷款申请_主
      */
-    @PreAuthorize("@ss.hasPermi('system:dksq:edit')")
     @Log(title = "贷款申请_主", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PostMapping("/put")
     public AjaxResult edit(@RequestBody Dksq dksq)
     {
         return toAjax(dksqService.updateDksq(dksq));
@@ -96,7 +93,7 @@ public class DksqController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:dksq:remove')")
     @Log(title = "贷款申请_主", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
+    @GetMapping("/delete/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
         return toAjax(dksqService.deleteDksqByIds(ids));

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/DksqLcjlController.java

@@ -85,7 +85,7 @@ public class DksqLcjlController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:lcjl:edit')")
     @Log(title = "贷款申请_流程记录", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PostMapping("/put")
     public AjaxResult edit(@RequestBody DksqLcjl dksqLcjl)
     {
         return toAjax(dksqLcjlService.updateDksqLcjl(dksqLcjl));
@@ -96,7 +96,7 @@ public class DksqLcjlController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:lcjl:remove')")
     @Log(title = "贷款申请_流程记录", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
+    @GetMapping("/delete/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
         return toAjax(dksqLcjlService.deleteDksqLcjlByIds(ids));

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java

@@ -96,7 +96,7 @@ public class SysConfigController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:config:edit')")
     @Log(title = "参数管理", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PostMapping("/put")
     public AjaxResult edit(@Validated @RequestBody SysConfig config)
     {
         if (!configService.checkConfigKeyUnique(config))
@@ -112,7 +112,7 @@ public class SysConfigController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:config:remove')")
     @Log(title = "参数管理", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{configIds}")
+    @GetMapping("/deletr/{configIds}")
     public AjaxResult remove(@PathVariable Long[] configIds)
     {
         configService.deleteConfigByIds(configIds);
@@ -124,7 +124,7 @@ public class SysConfigController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:config:remove')")
     @Log(title = "参数管理", businessType = BusinessType.CLEAN)
-    @DeleteMapping("/refreshCache")
+    @GetMapping("/refreshCache")
     public AjaxResult refreshCache()
     {
         configService.resetConfigCache();

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java

@@ -112,7 +112,7 @@ public class SysDeptController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:dept:edit')")
     @Log(title = "部门管理", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PostMapping("/put")
     public AjaxResult edit(@Validated @RequestBody SysDept dept)
     {
         Long deptId = dept.getDeptId();
@@ -138,7 +138,7 @@ public class SysDeptController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:dept:remove')")
     @Log(title = "部门管理", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{deptId}")
+    @GetMapping("/delete/{deptId}")
     public AjaxResult remove(@PathVariable Long deptId)
     {
         if (deptService.hasChildByDeptId(deptId))

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java

@@ -100,7 +100,7 @@ public class SysDictDataController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:dict:edit')")
     @Log(title = "字典数据", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PostMapping("/put")
     public AjaxResult edit(@Validated @RequestBody SysDictData dict)
     {
         dict.setUpdateBy(getUsername());
@@ -112,7 +112,7 @@ public class SysDictDataController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:dict:remove')")
     @Log(title = "字典类型", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{dictCodes}")
+    @PostMapping("/delete/{dictCodes}")
     public AjaxResult remove(@PathVariable Long[] dictCodes)
     {
         dictDataService.deleteDictDataByIds(dictCodes);

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java

@@ -84,7 +84,7 @@ public class SysDictTypeController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:dict:edit')")
     @Log(title = "字典类型", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PostMapping("/put")
     public AjaxResult edit(@Validated @RequestBody SysDictType dict)
     {
         if (!dictTypeService.checkDictTypeUnique(dict))
@@ -100,7 +100,7 @@ public class SysDictTypeController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:dict:remove')")
     @Log(title = "字典类型", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{dictIds}")
+    @GetMapping("/delete/{dictIds}")
     public AjaxResult remove(@PathVariable Long[] dictIds)
     {
         dictTypeService.deleteDictTypeByIds(dictIds);
@@ -112,7 +112,7 @@ public class SysDictTypeController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:dict:remove')")
     @Log(title = "字典类型", businessType = BusinessType.CLEAN)
-    @DeleteMapping("/refreshCache")
+    @GetMapping("/refreshCache")
     public AjaxResult refreshCache()
     {
         dictTypeService.resetDictCache();

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysExpressionController.java

@@ -85,7 +85,7 @@ public class SysExpressionController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:expression:edit')")
     @Log(title = "流程达式", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PostMapping("/put")
     public AjaxResult edit(@RequestBody SysExpression sysExpression)
     {
         return toAjax(sysExpressionService.updateSysExpression(sysExpression));
@@ -96,7 +96,7 @@ public class SysExpressionController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:expression:remove')")
     @Log(title = "流程达式", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
+	@GetMapping("/delete/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
         return toAjax(sysExpressionService.deleteSysExpressionByIds(ids));

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysListenerController.java

@@ -85,7 +85,7 @@ public class SysListenerController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:listener:edit')")
     @Log(title = "流程监听", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PostMapping("/put")
     public AjaxResult edit(@RequestBody SysListener sysListener)
     {
         return toAjax(sysListenerService.updateSysListener(sysListener));
@@ -96,7 +96,7 @@ public class SysListenerController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:listener:remove')")
     @Log(title = "流程监听", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
+	@GetMapping("/delete/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
         return toAjax(sysListenerService.deleteSysListenerByIds(ids));

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java

@@ -2,6 +2,9 @@ package com.ruoyi.web.controller.system;
 
 import java.util.List;
 import java.util.Set;
+
+import com.ruoyi.system.domain.Dksq;
+import com.ruoyi.system.service.IDksqService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -33,6 +36,9 @@ public class SysLoginController
 
     @Autowired
     private SysPermissionService permissionService;
+    @Autowired
+    private IDksqService dksqService;
+
 
     /**
      * 登录方法
@@ -81,6 +87,22 @@ public class SysLoginController
         // 权限集合
         Set<String> permissions = permissionService.getMenuPermission(user);
         AjaxResult ajax = AjaxResult.success();
+
+        //查询用户贷款信息
+        List<Dksq> dksqs = dksqService.selectDksqByIdCard(user.getUserName());
+        //默认-1是未申请贷款
+        ajax.put("dk","-1");
+        if (dksqs !=null && dksqs.size() > 0){
+            for (Dksq dksq : dksqs) {
+                String type = dksq.getType();
+                String result = dksq.getResult();
+                if (!"4".equals(type) && !"2".equals(result)){
+                    //说明有正在贷款的
+                    ajax.put("dk",dksq.getId());
+                    break;
+                }
+            }
+        }
         ajax.put("user", user);
         ajax.put("roles", roles);
         ajax.put("permissions", permissions);

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java

@@ -102,7 +102,7 @@ public class SysMenuController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:menu:edit')")
     @Log(title = "菜单管理", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PostMapping("/put")
     public AjaxResult edit(@Validated @RequestBody SysMenu menu)
     {
         if (!menuService.checkMenuNameUnique(menu))
@@ -126,7 +126,7 @@ public class SysMenuController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:menu:remove')")
     @Log(title = "菜单管理", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{menuId}")
+    @GetMapping("/delete/{menuId}")
     public AjaxResult remove(@PathVariable("menuId") Long menuId)
     {
         if (menuService.hasChildByMenuId(menuId))

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java

@@ -71,7 +71,7 @@ public class SysNoticeController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:notice:edit')")
     @Log(title = "通知公告", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PostMapping("/put")
     public AjaxResult edit(@Validated @RequestBody SysNotice notice)
     {
         notice.setUpdateBy(getUsername());
@@ -83,7 +83,7 @@ public class SysNoticeController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:notice:remove')")
     @Log(title = "通知公告", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{noticeIds}")
+    @GetMapping("/delete/{noticeIds}")
     public AjaxResult remove(@PathVariable Long[] noticeIds)
     {
         return toAjax(noticeService.deleteNoticeByIds(noticeIds));

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java

@@ -91,7 +91,7 @@ public class SysPostController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:post:edit')")
     @Log(title = "岗位管理", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PostMapping("/put")
     public AjaxResult edit(@Validated @RequestBody SysPost post)
     {
         if (!postService.checkPostNameUnique(post))
@@ -111,7 +111,7 @@ public class SysPostController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:post:remove')")
     @Log(title = "岗位管理", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{postIds}")
+    @GetMapping("/delete/{postIds}")
     public AjaxResult remove(@PathVariable Long[] postIds)
     {
         return toAjax(postService.deletePostByIds(postIds));

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java

@@ -56,7 +56,7 @@ public class SysProfileController extends BaseController
      * 修改用户
      */
     @Log(title = "个人信息", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PostMapping("/put")
     public AjaxResult updateProfile(@RequestBody SysUser user)
     {
         LoginUser loginUser = getLoginUser();
@@ -91,7 +91,7 @@ public class SysProfileController extends BaseController
      * 重置密码
      */
     @Log(title = "个人信息", businessType = BusinessType.UPDATE)
-    @PutMapping("/updatePwd")
+    @PostMapping("/updatePwd")
     public AjaxResult updatePwd(String oldPassword, String newPassword)
     {
         LoginUser loginUser = getLoginUser();

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java

@@ -111,7 +111,7 @@ public class SysRoleController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PostMapping("/put")
     public AjaxResult edit(@Validated @RequestBody SysRole role)
     {
         roleService.checkRoleAllowed(role);
@@ -146,7 +146,7 @@ public class SysRoleController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
-    @PutMapping("/dataScope")
+    @PostMapping("/dataScope")
     public AjaxResult dataScope(@RequestBody SysRole role)
     {
         roleService.checkRoleAllowed(role);
@@ -159,7 +159,7 @@ public class SysRoleController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
-    @PutMapping("/changeStatus")
+    @PostMapping("/changeStatus")
     public AjaxResult changeStatus(@RequestBody SysRole role)
     {
         roleService.checkRoleAllowed(role);
@@ -173,7 +173,7 @@ public class SysRoleController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:role:remove')")
     @Log(title = "角色管理", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{roleIds}")
+    @GetMapping("/delete/{roleIds}")
     public AjaxResult remove(@PathVariable Long[] roleIds)
     {
         return toAjax(roleService.deleteRoleByIds(roleIds));
@@ -218,7 +218,7 @@ public class SysRoleController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.GRANT)
-    @PutMapping("/authUser/cancel")
+    @PostMapping("/authUser/cancel")
     public AjaxResult cancelAuthUser(@RequestBody SysUserRole userRole)
     {
         return toAjax(roleService.deleteAuthUser(userRole));
@@ -240,7 +240,7 @@ public class SysRoleController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.GRANT)
-    @PutMapping("/authUser/selectAll")
+    @PostMapping("/authUser/selectAll")
     public AjaxResult selectAuthUserAll(Long roleId, Long[] userIds)
     {
         roleService.checkRoleDataScope(roleId);

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -146,7 +146,7 @@ public class SysUserController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:user:edit')")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PostMapping("/put")
     public AjaxResult edit(@Validated @RequestBody SysUser user)
     {
         userService.checkUserAllowed(user);
@@ -172,7 +172,7 @@ public class SysUserController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:user:remove')")
     @Log(title = "用户管理", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{userIds}")
+    @GetMapping("/delete/{userIds}")
     public AjaxResult remove(@PathVariable Long[] userIds)
     {
         if (ArrayUtils.contains(userIds, getUserId()))
@@ -187,7 +187,7 @@ public class SysUserController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:user:resetPwd')")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
-    @PutMapping("/resetPwd")
+    @PostMapping("/resetPwd")
     public AjaxResult resetPwd(@RequestBody SysUser user)
     {
         userService.checkUserAllowed(user);
@@ -202,7 +202,7 @@ public class SysUserController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:user:edit')")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
-    @PutMapping("/changeStatus")
+    @PostMapping("/changeStatus")
     public AjaxResult changeStatus(@RequestBody SysUser user)
     {
         userService.checkUserAllowed(user);
@@ -231,7 +231,7 @@ public class SysUserController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:user:edit')")
     @Log(title = "用户管理", businessType = BusinessType.GRANT)
-    @PutMapping("/authRole")
+    @PostMapping("/authRole")
     public AjaxResult insertAuthRole(Long userId, Long[] roleIds)
     {
         userService.checkUserDataScope(userId);

ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java

@@ -63,7 +63,15 @@ public class Constants
      * 登录失败
      */
     public static final String LOGIN_FAIL = "Error";
- 
+
+    /**
+     * 自定义常量
+     */
+    public static final String ONE = "1";
+    public static final String TWO = "2";
+    public static final String THR = "3";
+    public static final String FOR = "4";
+
     /**
      * 验证码有效期（分钟）
      */

ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java

@@ -98,7 +98,11 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
         Date now = new Date();
         return DateFormatUtils.format(now, "yyyy/MM/dd");
     }
+    public static final String format(Date date,String format)
+    {
 
+        return DateFormatUtils.format(date, format);
+    }
     /**
      * 日期路径 即年/月/日 如20180808
      */
@@ -147,7 +151,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     /**
      * 计算时间差
      *
-     * @param endTime 最后时间
+     * @param endDate 最后时间
      * @param startTime 开始时间
      * @return 时间差（天/小时/分钟）
      */

ruoyi-flowable/src/main/java/com/ruoyi/flowable/controller/FlowInstanceController.java

@@ -53,7 +53,7 @@ public class FlowInstanceController {
     }
 
     @ApiOperation(value = "删除流程实例")
-    @DeleteMapping(value = "/delete/{instanceIds}")
+    @GetMapping(value = "/delete/{instanceIds}")
     public AjaxResult delete(@ApiParam(value = "流程实例ID", required = true) @PathVariable String[] instanceIds,
                              @ApiParam(value = "删除原因") @RequestParam(required = false) String deleteReason) {
         for (String instanceId : instanceIds) {

ruoyi-flowable/src/main/java/com/ruoyi/flowable/controller/FlowTaskController.java

@@ -111,7 +111,7 @@ public class FlowTaskController {
     }
 
     @ApiOperation(value = "删除任务")
-    @DeleteMapping(value = "/delete")
+    @GetMapping(value = "/delete")
     public AjaxResult delete(@RequestBody FlowTaskVo flowTaskVo) {
         flowTaskService.deleteTask(flowTaskVo);
         return AjaxResult.success();

ruoyi-flowable/src/main/java/com/ruoyi/flowable/controller/SysFormController.java

@@ -90,7 +90,7 @@ public class SysFormController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('flowable:form:edit')")
     @Log(title = "流程表单", businessType = BusinessType.UPDATE)
-    @PutMapping
+    @PostMapping("/put")
     public AjaxResult edit(@RequestBody SysForm sysForm) {
         return toAjax(SysFormService.updateSysForm(sysForm));
     }
@@ -100,7 +100,7 @@ public class SysFormController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('flowable:form:remove')")
     @Log(title = "流程表单", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{formIds}")
+    @GetMapping("/{formIds}")
     public AjaxResult remove(@PathVariable Long[] formIds) {
         return toAjax(SysFormService.deleteSysFormByIds(formIds));
     }

ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java

@@ -732,6 +732,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
             flowTask.setStartUserName(startUser.getNickName());
             flowTask.setStartDeptName(Objects.nonNull(startUser.getDept()) ? startUser.getDept().getDeptName() : "");
             flowList.add(flowTask);
+
         }
 
         page.setRecords(flowList);

ruoyi-system/src/main/java/com/ruoyi/system/domain/Dksq.java

@@ -1,6 +1,8 @@
 package com.ruoyi.system.domain;
 
 import java.util.Date;
+import java.util.List;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -22,7 +24,7 @@ public class Dksq extends BaseEntity
 
     /** 申请金额(万元) */
     @Excel(name = "申请金额(万元)")
-    private String sqMoney;
+    private Double sqMoney;
 
     /** 担保类型 1:担保人担保 2:房产担保 */
     @Excel(name = "担保类型 1:担保人担保 2:房产担保")
@@ -103,7 +105,7 @@ public class Dksq extends BaseEntity
 
     /** 实际放贷金额(万元) */
     @Excel(name = "实际放贷金额(万元)")
-    private String fdMoney;
+    private Double fdMoney;
 
     /** 实际放贷时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
@@ -112,14 +114,27 @@ public class Dksq extends BaseEntity
     /**
      * 贷款流程记录表
      */
-    private DksqLcjl dksqLcjl;
+    private List<DksqLcjl> dksqLcjlList;
+    /**
+     * 贷款附件list
+     */
+    private List<DkFj> dkFjList;
+
+
+    public List<DksqLcjl> getDksqLcjlList() {
+        return dksqLcjlList;
+    }
 
-    public DksqLcjl getDksqLcjl() {
-        return dksqLcjl;
+    public void setDksqLcjlList(List<DksqLcjl> dksqLcjlList) {
+        this.dksqLcjlList = dksqLcjlList;
     }
 
-    public void setDksqLcjl(DksqLcjl dksqLcjl) {
-        this.dksqLcjl = dksqLcjl;
+    public List<DkFj> getDkFjList() {
+        return dkFjList;
+    }
+
+    public void setDkFjList(List<DkFj> dkFjList) {
+        this.dkFjList = dkFjList;
     }
 
     public void setId(Long id)
@@ -131,16 +146,16 @@ public class Dksq extends BaseEntity
     {
         return id;
     }
-    public void setSqMoney(String sqMoney) 
-    {
-        this.sqMoney = sqMoney;
-    }
 
-    public String getSqMoney() 
-    {
+    public Double getSqMoney() {
         return sqMoney;
     }
-    public void setDbType(String dbType) 
+
+    public void setSqMoney(Double sqMoney) {
+        this.sqMoney = sqMoney;
+    }
+
+    public void setDbType(String dbType)
     {
         this.dbType = dbType;
     }
@@ -311,16 +326,16 @@ public class Dksq extends BaseEntity
     {
         return fdBankId;
     }
-    public void setFdMoney(String fdMoney) 
-    {
-        this.fdMoney = fdMoney;
-    }
 
-    public String getFdMoney() 
-    {
+    public Double getFdMoney() {
         return fdMoney;
     }
-    public void setFdTime(Date fdTime) 
+
+    public void setFdMoney(Double fdMoney) {
+        this.fdMoney = fdMoney;
+    }
+
+    public void setFdTime(Date fdTime)
     {
         this.fdTime = fdTime;
     }

ruoyi-system/src/main/java/com/ruoyi/system/mapper/DkFjMapper.java

@@ -50,6 +50,7 @@ public interface DkFjMapper
      * @return 结果
      */
     public int deleteDkFjById(Long id);
+    public int deleteDkFjByDkId(Long id);
 
     /**
      * 批量删除贷款_附件

ruoyi-system/src/main/java/com/ruoyi/system/mapper/DksqMapper.java

@@ -58,4 +58,6 @@ public interface DksqMapper
      * @return 结果
      */
     public int deleteDksqByIds(Long[] ids);
+
+    public List<Dksq> selectDksqByIdCard(String idCard);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/IDkCommonServerce.java

@@ -10,4 +10,9 @@ import com.ruoyi.system.domain.Dksq;
  */
 public interface IDkCommonServerce {
     public AjaxResult shenHe(Dksq dksq);
+    public AjaxResult zhiPai(Dksq dksq);
+    public AjaxResult pingGu(Dksq dksq);
+    public AjaxResult fangDai(Dksq dksq);
+    public AjaxResult index();
+    public AjaxResult eCharts(Dksq dksq);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/IDksqService.java

@@ -58,4 +58,12 @@ public interface IDksqService
      * @return 结果
      */
     public int deleteDksqById(Long id);
+
+    /**
+     * 根据申请人Id查询申请信息
+     * @param idCard
+     * @return
+     */
+    public List<Dksq> selectDksqByIdCard(String idCard);
+
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DkCommonServerceImpl.java

@@ -1,18 +1,33 @@
 package com.ruoyi.system.service.impl;
 
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.core.domain.entity.SysRole;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.domain.Dksq;
 import com.ruoyi.system.domain.DksqLcjl;
 import com.ruoyi.system.mapper.DksqLcjlMapper;
 import com.ruoyi.system.mapper.DksqMapper;
+import com.ruoyi.system.mapper.SysDeptMapper;
 import com.ruoyi.system.service.IDkCommonServerce;
+import org.apache.poi.ss.usermodel.DateUtil;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.text.NumberFormat;
+import java.util.*;
+import java.util.stream.Collectors;
+
+import static com.ruoyi.common.constant.Constants.*;
 
 /**
  * @Author: tjf
  * @Date: 2023/6/15 15:32
  * @Describe:
  */
+@Service
 public class DkCommonServerceImpl implements IDkCommonServerce {
 
     @Autowired
@@ -20,21 +35,234 @@ public class DkCommonServerceImpl implements IDkCommonServerce {
     @Autowired
     private DksqLcjlMapper dksqLcjlMapper;
 
+    @Autowired
+    private SysDeptMapper sysDeptMapper;
+
     /**
      * 劳动局审核
+     *
      * @param dksq
      * @return
      */
     @Override
     public AjaxResult shenHe(Dksq dksq) {
-        if (!"1".equals(dksq.getType())){
-            return AjaxResult.error("当前项目异常");
+        if (!ONE.equals(dksq.getType())) {
+            return AjaxResult.error("请勿重复审核");
+        }
+        //通过不通过都设置为2
+        dksq.setType(TWO);
+        dksqMapper.updateDksq(dksq);
+
+        //插入流程记录表
+        DksqLcjl dksqLcjl = new DksqLcjl();
+        dksqLcjl.setDksqId(dksq.getId());
+        dksqLcjl.setType(TWO);
+        dksqLcjl.setResult(dksq.getResult());
+        dksqLcjl.setCreateBy(SecurityUtils.getUsername());
+        dksqLcjlMapper.insertDksqLcjl(dksqLcjl);
+        return AjaxResult.success();
+    }
+
+
+    /**
+     * 劳动局指派银行
+     *
+     * @param dksq
+     * @return
+     */
+    @Override
+    public AjaxResult zhiPai(Dksq dksq) {
+        if (!TWO.equals(dksq.getType()) && !TWO.equals(dksq.getResult())) {
+            return AjaxResult.error("审核未通过,请勿指派下一阶段");
+        }
+        //设置为等待银行评估
+        dksq.setType(THR);
+        dksq.setResult(ONE);
+        dksqMapper.updateDksq(dksq);
+
+        //插入流程记录表
+        DksqLcjl dksqLcjl = new DksqLcjl();
+        dksqLcjl.setDksqId(dksq.getId());
+        dksqLcjl.setType(THR);
+        dksqLcjl.setResult(ONE);
+        dksqLcjl.setCreateBy(SecurityUtils.getUsername());
+        dksqLcjlMapper.insertDksqLcjl(dksqLcjl);
+        return AjaxResult.success();
+    }
+
+    /**
+     * 银行评估
+     *
+     * @param dksq
+     * @return
+     */
+    @Override
+    public AjaxResult pingGu(Dksq dksq) {
+        if (!THR.equals(dksq.getType()) && !ONE.equals(dksq.getResult())) {
+            return AjaxResult.error("当前状态异常");
         }
-        dksq.setType("2");
+        //根据评估结果来设置状态
+        String result = dksq.getResult();
+        DksqLcjl dksqLcjl = new DksqLcjl();
+        //流程记录
+        dksqLcjl.setType(THR);
+        dksqLcjl.setResult(result);
+        //不通过
+        if (THR.equals(result)){
+         //回到人社局审核通过
+            dksq.setType(TWO);
+            dksq.setResult(TWO);
+            dksq.setFdBank(null);
+            dksq.setFdBankId(-1L);
+        }else if(TWO.equals(result)){
+            //通过进去到等待放贷
+            dksq.setType(FOR);
+            dksq.setResult(ONE);
+        }
+        dksqMapper.updateDksq(dksq);
+        //插入流程记录表
+        dksqLcjl.setDksqId(dksq.getId());
+        dksqLcjl.setCreateBy(SecurityUtils.getUsername());
+        dksqLcjlMapper.insertDksqLcjl(dksqLcjl);
+        return AjaxResult.success();
+    }
+
+    /**
+     * 银行放贷
+     * @param dksq
+     * @return
+     */
+    @Override
+    public AjaxResult fangDai(Dksq dksq) {
+        if (!FOR.equals(dksq.getType()) && !ONE.equals(dksq.getResult())) {
+            return AjaxResult.error("当前状态异常");
+        }
+        //默认放贷成功
+        //流程记录
+        dksq.setResult(TWO);
+        dksq.setFdTime(DateUtils.parseDate(DateUtils.getDate()));
         dksqMapper.updateDksq(dksq);
         //插入流程记录表
-        DksqLcjl dksqLcjl = dksq.getDksqLcjl();
+        DksqLcjl dksqLcjl = new DksqLcjl();
+        dksqLcjl.setType(FOR);
+        dksqLcjl.setResult(TWO);
+        dksqLcjl.setDksqId(dksq.getId());
+        dksqLcjl.setCreateBy(SecurityUtils.getUsername());
         dksqLcjlMapper.insertDksqLcjl(dksqLcjl);
         return AjaxResult.success();
     }
+
+    /**
+     * 首页统计
+     * @return
+     */
+    @Override
+    public AjaxResult index() {
+        Dksq dksq = new Dksq();
+        //定义返回值
+        Map<String,Object> indexMap = new HashMap<>();
+        Map<String,Object> up = new HashMap<>();
+        up.put("sqCount",0);
+        up.put("sqMoney",0);
+        up.put("dbr",0);
+        up.put("fc",0);
+        up.put("dbrPer","00.0%");
+        up.put("fcPer","00.0%");
+        Map<String,Double> right = new HashMap<>();
+        //获取所有银行名称
+        SysDept sysDept = new SysDept();
+        sysDept.setParentId(110L);
+        List<SysDept> sysDepts = sysDeptMapper.selectDeptList(sysDept);
+        if (sysDepts != null && sysDepts.size() > 0){
+            for (SysDept dept : sysDepts) {
+                right.put(dept.getDeptName(),0D);
+            }
+        }
+        //判断用户角色 如果是银行角色
+        List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
+        if (roles != null && roles.size() > 0){
+            for (SysRole role : roles) {
+                if ("bank".equals(role.getRoleKey())){
+                    //查询指派给自己的
+                    dksq.setFdBankId(SecurityUtils.getLoginUser().getDeptId());
+                    break;
+                }
+            }
+        }
+        //所有的贷款信息
+        dksq.setCreateTime(DateUtils.parseDate(DateUtils.getDate()));
+        List<Dksq> dksqs = dksqMapper.selectDksqList(dksq);
+        if (dksqs != null && dksqs.size() > 0){
+            //申请人数
+            up.put("sqCount",dksqs.size());
+            double sqMoney = dksqs.stream().mapToDouble(Dksq::getSqMoney).sum();
+            up.put("sqMoney",sqMoney);
+            //担保人担保
+           double dbr = dksqs.stream().filter(s -> ONE.equals(s.getDbType())).count();
+           //房产担保
+            double fc = dksqs.stream().filter(s -> TWO.equals(s.getDbType())).count();
+            up.put("dbr",dbr);
+            up.put("fc",fc);
+            Map<String, Double> collect = dksqs.stream().filter(s -> StringUtils.isNotBlank(s.getFdBank())).collect(Collectors.groupingBy(Dksq::getFdBank, Collectors.summingDouble(Dksq::getFdMoney)));
+            for (String deptName : collect.keySet()) {
+                right.put(deptName,collect.get(deptName));
+            }
+            NumberFormat nf  =  NumberFormat.getPercentInstance();
+            nf.setMinimumFractionDigits( 1 );
+            up.put("dbrPer",nf.format(dbr / (double) dksqs.size()));
+            up.put("fcPer",nf.format(fc / (double)dksqs.size()));
+        }
+        indexMap.put("up",up);
+        indexMap.put("right",right);
+        return AjaxResult.success(indexMap);
+    }
+
+    /**
+     * 首页eCharts
+     * 每个月无担保 贷款金额和有担保贷款金额
+     * @param dksq
+     * @return
+     */
+    @Override
+    public AjaxResult eCharts(Dksq dksq) {
+        Object beginTime = dksq.getParams().get("beginTime");
+        //把查询时间设置为20230101
+        dksq.getParams().put("beginTime",beginTime+"0101");
+        dksq.setType(FOR);
+        dksq.setResult(TWO);
+        Map<String,Object> indexMap = new HashMap<>();
+        List<Object> months = new ArrayList<>();
+        List<Object> y1 = new ArrayList<>();
+        List<Object> y2 = new ArrayList<>();
+        for (int i = 1; i <= 12; i++) {
+            months.add(i+"");
+        }
+        indexMap.put("x",months);
+        List<Dksq> dksqs = dksqMapper.selectDksqList(dksq);
+        if (dksqs != null && dksqs.size() > 0){
+            //放贷统计
+            Map<String, Double> collectY1 = dksqs.stream().filter(s -> ONE.equals(s.getDbGrade())).collect(Collectors.groupingBy(o -> DateUtils.format(o.getFdTime(), "M"), Collectors.summingDouble(Dksq::getFdMoney)));
+            for (Object month : months) {
+                Double aDouble = collectY1.get(month);
+                if (aDouble == null){
+                    y1.add(0);
+                }else {
+                    y1.add(aDouble);
+                }
+            }
+            //放贷统计
+            Map<String, Double> collectY2 = dksqs.stream().filter(s -> !ONE.equals(s.getDbGrade())).collect(Collectors.groupingBy(o -> DateUtils.format(o.getFdTime(), "M"), Collectors.summingDouble(Dksq::getFdMoney)));
+            for (Object month : months) {
+                Double aDouble = collectY2.get(month);
+                if (aDouble == null){
+                    y2.add(0);
+                }else {
+                    y2.add(aDouble);
+                }
+            }
+        }
+        indexMap.put("y1",y1);
+        indexMap.put("y2",y2);
+        return AjaxResult.success(indexMap);
+    }
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/DksqServiceImpl.java

@@ -1,96 +1,187 @@
 package com.ruoyi.system.service.impl;
 
 import java.util.List;
+
+import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.system.domain.DkFj;
+import com.ruoyi.system.domain.DksqLcjl;
+import com.ruoyi.system.mapper.DkFjMapper;
+import com.ruoyi.system.mapper.DksqLcjlMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.system.mapper.DksqMapper;
 import com.ruoyi.system.domain.Dksq;
 import com.ruoyi.system.service.IDksqService;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+
+import static com.ruoyi.common.constant.Constants.*;
+
 /**
  * 贷款申请_主Service业务层处理
- * 
+ *
  * @author boman
  * @date 2023-06-15
  */
 @Service
-public class DksqServiceImpl implements IDksqService 
-{
+public class DksqServiceImpl implements IDksqService {
     @Autowired
     private DksqMapper dksqMapper;
 
+    @Autowired
+    private DksqLcjlMapper dksqLcjlMapper;
+    @Autowired
+    private DkFjMapper dkFjMapper;
+
+
     /**
      * 查询贷款申请_主
-     * 
+     *
      * @param id 贷款申请_主主键
      * @return 贷款申请_主
      */
     @Override
-    public Dksq selectDksqById(Long id)
-    {
-        return dksqMapper.selectDksqById(id);
+    public Dksq selectDksqById(Long id) {
+        Dksq dksq = dksqMapper.selectDksqById(id);
+        //查询附件
+        DkFj dkFj = new DkFj();
+        dkFj.setDkId(id);
+        List<DkFj> dkFjs = dkFjMapper.selectDkFjList(dkFj);
+        dksq.setDkFjList(dkFjs);
+        //查询流程
+        DksqLcjl dksqLcjl = new DksqLcjl();
+        dksqLcjl.setDksqId(id);
+        List<DksqLcjl> dksqLcjls = dksqLcjlMapper.selectDksqLcjlList(dksqLcjl);
+        dksq.setDksqLcjlList(dksqLcjls);
+        return dksq;
     }
 
     /**
      * 查询贷款申请_主列表
-     * 
+     *
      * @param dksq 贷款申请_主
      * @return 贷款申请_主
      */
     @Override
-    public List<Dksq> selectDksqList(Dksq dksq)
-    {
-        return dksqMapper.selectDksqList(dksq);
+    public List<Dksq> selectDksqList(Dksq dksq) {
+        //判断用户角色 如果是银行角色
+        List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
+        if (roles != null && roles.size() > 0){
+            for (SysRole role : roles) {
+                 if ("bank".equals(role.getRoleKey())){
+                     //查询指派给自己的
+                    dksq.setFdBankId(SecurityUtils.getLoginUser().getDeptId());
+                    break;
+                }
+            }
+        }
+        List<Dksq> dksqs = dksqMapper.selectDksqList(dksq);
+        return dksqs;
     }
 
     /**
      * 新增贷款申请_主
-     * 
+     *
      * @param dksq 贷款申请_主
      * @return 结果
      */
     @Override
-    public int insertDksq(Dksq dksq)
-    {
+    public int insertDksq(Dksq dksq) {
+        dksq.setCreateBy(SecurityUtils.getUsername());
         dksq.setCreateTime(DateUtils.getNowDate());
-        return dksqMapper.insertDksq(dksq);
+        int i = dksqMapper.insertDksq(dksq);
+        //插入附件表
+        List<DkFj> dkFjList = dksq.getDkFjList();
+        if (dkFjList != null && dkFjList.size() > 0){
+            for (DkFj dkFj : dkFjList) {
+                dkFj.setDkId(dksq.getId());
+                dkFjMapper.insertDkFj(dkFj);
+            }
+        }
+        //插入流程记录表
+        DksqLcjl dksqLcjl = new DksqLcjl();
+        dksqLcjl.setDksqId(dksq.getId());
+        dksqLcjl.setType(ONE);
+        dksqLcjl.setResult(TWO);
+        dksqLcjl.setCreateBy(SecurityUtils.getUsername());
+        dksqLcjlMapper.insertDksqLcjl(dksqLcjl);
+
+        return i;
     }
 
     /**
      * 修改贷款申请_主
-     * 
+     *
      * @param dksq 贷款申请_主
      * @return 结果
      */
     @Override
-    public int updateDksq(Dksq dksq)
-    {
-        dksq.setUpdateTime(DateUtils.getNowDate());
-        return dksqMapper.updateDksq(dksq);
+    public int updateDksq(Dksq dksq) {
+        //判断什么时候能修改
+        String result = dksq.getResult();
+        String type = dksq.getType();
+        int i = 0;
+        //只有人社局审核不通过,才能让申请用户修改
+        if (TWO.equals(type) && THR.equals(result)) {
+            dksq.setUpdateTime(DateUtils.getNowDate());
+            //修改成提交申请/通过
+            dksq.setType(ONE);
+            dksq.setResult(TWO);
+            i = dksqMapper.updateDksq(dksq);
+
+            //插入流程记录表
+            DksqLcjl dksqLcjl = new DksqLcjl();
+            dksqLcjl.setDksqId(dksq.getId());
+            dksqLcjl.setType(ONE);
+            dksqLcjl.setResult(TWO);
+            dksqLcjl.setCreateBy(SecurityUtils.getUsername());
+            dksqLcjlMapper.insertDksqLcjl(dksqLcjl);
+            //删除原先的附件,上传新的附件
+            dkFjMapper.deleteDkFjByDkId(dksq.getId());
+            List<DkFj> dkFjList = dksq.getDkFjList();
+            if (dkFjList != null && dkFjList.size() > 0){
+                for (DkFj dkFj : dkFjList) {
+                    dkFj.setDkId(dksq.getId());
+                    dkFjMapper.insertDkFj(dkFj);
+                }
+            }
+        }
+        return i;
     }
 
     /**
      * 批量删除贷款申请_主
-     * 
+     *
      * @param ids 需要删除的贷款申请_主主键
      * @return 结果
      */
     @Override
-    public int deleteDksqByIds(Long[] ids)
-    {
+    public int deleteDksqByIds(Long[] ids) {
         return dksqMapper.deleteDksqByIds(ids);
     }
 
     /**
      * 删除贷款申请_主信息
-     * 
+     *
      * @param id 贷款申请_主主键
      * @return 结果
      */
     @Override
-    public int deleteDksqById(Long id)
-    {
+    public int deleteDksqById(Long id) {
         return dksqMapper.deleteDksqById(id);
     }
+
+    /**
+     * 根据申请人id查询申请信息
+     * @param idCard
+     * @return
+     */
+    @Override
+    public List<Dksq> selectDksqByIdCard(String idCard) {
+        return dksqMapper.selectDksqByIdCard(idCard);
+    }
 }

ruoyi-system/src/main/resources/mapper/system/DkFjMapper.xml

@@ -91,4 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
+    <delete id="deleteDkFjByDkId" parameterType="Long">
+                delete from dk_fj where dk_id = #{dkId}
+    </delete>
 </mapper>

ruoyi-system/src/main/resources/mapper/system/DksqLcjlMapper.xml

@@ -44,10 +44,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="result != null">result,</if>
             <if test="status != null">status,</if>
             <if test="createBy != null">create_by,</if>
-            <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="remark != null">remark,</if>
+            create_time
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="dksqId != null">#{dksqId},</if>
@@ -55,10 +55,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="result != null">#{result},</if>
             <if test="status != null">#{status},</if>
             <if test="createBy != null">#{createBy},</if>
-            <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="remark != null">#{remark},</if>
+            sysdate()
          </trim>
     </insert>
 

ruoyi-system/src/main/resources/mapper/system/DksqMapper.xml

@@ -66,6 +66,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="fdBankId != null "> and fd_bank_id = #{fdBankId}</if>
             <if test="fdMoney != null  and fdMoney != ''"> and fd_money = #{fdMoney}</if>
             <if test="fdTime != null "> and fd_time = #{fdTime}</if>
+            <if test="createTime != null "><!-- 开始时间检索 -->
+                AND date_format(create_time,'%Y%m') &gt;= date_format(#{createTime},'%Y%m')
+                AND date_format(create_time,'%Y%m') &lt;= date_format(#{createTime},'%Y%m')
+            </if>
+            <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
+                AND date_format(fd_time,'%Y') &gt;= date_format(#{params.beginTime},'%Y')
+                AND date_format(fd_time,'%Y') &lt;= date_format(#{params.beginTime},'%Y')
+            </if>
         </where>
     </select>
     
@@ -73,7 +81,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectDksqVo"/>
         where id = #{id}
     </select>
-        
+    <select id="selectDksqByIdCard" parameterType="string" resultMap="DksqResult">
+        <include refid="selectDksqVo"/>
+        where sq_id_card = #{idCard}
+    </select>
+
     <insert id="insertDksq" parameterType="Dksq" useGeneratedKeys="true" keyProperty="id">
         insert into dksq
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -165,8 +177,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="remark != null">remark = #{remark},</if>
-            <if test="fdBank != null">fd_bank = #{fdBank},</if>
-            <if test="fdBankId != null">fd_bank_id = #{fdBankId},</if>
+            <if test="fdBank != ''">fd_bank = #{fdBank},</if>
+            <if test="fdBankId == -1">fd_bank_id = null,</if>
+            <if test="fdBankId != -1">fd_bank_id = #{fdBankId},</if>
             <if test="fdMoney != null">fd_money = #{fdMoney},</if>
             <if test="fdTime != null">fd_time = #{fdTime},</if>
         </trim>