1.特审复开更新

2.权限优化

tnc-sms/src/main/java/org/jeecg/modules/smscheck/controller/SpecialExaminationContrller.java

@@ -29,7 +29,6 @@ import org.jeecg.modules.smscheck.entity.*;
 import org.jeecg.modules.smscheck.entity.excel.SpecialExaminationExport;
 import org.jeecg.modules.smscheck.enums.SpecialExaminationReopen;
 import org.jeecg.modules.smscheck.service.*;
-import org.jeecg.modules.smscheck.service.impl.SmsCheckTaskServiceImpl;
 import org.jeecg.modules.smscheck.vo.SpecialExaminationCustomerVo;
 import org.jeecg.modules.smscheck.vo.SpecialExaminationVo;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
@@ -45,7 +44,6 @@ import org.springframework.web.servlet.ModelAndView;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -431,6 +429,8 @@ public class SpecialExaminationContrller extends JeecgController<SmsCheckCustome
             info.setTaskId(generate);
             info.setStaffUsername(sysUser.getUsername());
             info.setStaffName(sysUser.getRealname());
+            // 客户经理手机号
+            info.setAccountManagerPhone(sysUser.getPhone());
             info.setDelFlag(CommonConstant.DEL_FLAG_0);
             // 0：未处理；1：未完善；2：待稽核；3：待整改；4：已整改；5：稽核通过；
             info.setCheckState(CheckStateCode.CHECK_STSTE_0);
@@ -556,7 +556,7 @@ public class SpecialExaminationContrller extends JeecgController<SmsCheckCustome
     //@AutoLog(value = "客户信息-通过id查询")
     @ApiOperation(value = "客户信息-通过id查询 稽核统计数", notes = "客户信息-通过id查询 稽核统计数")
     @GetMapping(value = "/type/count")
-    @PermissionData(pageComponent = "smscheck/modules/TaskCheckList")
+    @PermissionData(pageComponent = "specialApply/modules/TaskCheckList")
     public Result<Dict> count(HttpServletRequest request) {
         Dict dict = Dict.create();
         //0：未处理；1：未完善；2：待稽核； ；4：待整改；5：稽核通过；*/
@@ -612,6 +612,7 @@ public class SpecialExaminationContrller extends JeecgController<SmsCheckCustome
     }
 
     @RequestMapping(value = "/exportXls")
+    @PermissionData(pageComponent = "specialApply/modules/TaskCheckList")
     public ModelAndView exportXls(HttpServletRequest request, SmsCheckCustomerInfo smsCheckCustomerInfo) {
         smsCheckCustomerInfo.setType(3);
         return exportXls(request, smsCheckCustomerInfo, SpecialExaminationExport.class, "特审复开信息");
@@ -672,10 +673,14 @@ public class SpecialExaminationContrller extends JeecgController<SmsCheckCustome
                     if (smcSpecialCheckLog.getNumberCardState() != null &&  !smcSpecialCheckLog.getNumberCardState().equals(smcSpecialCheckLogHistory.getNumberCardState())){
                         specialExaminationExport.setNumberCardStateIs(1);
                     }
+                    if (smcSpecialCheckLog.getHandNumberCardState() != null && !smcSpecialCheckLog.getHandNumberCardState().equals(smcSpecialCheckLogHistory.getHandNumberCardState())){
+                        specialExaminationExport.setHandNumberCardStateIs(1);
+
                     if (smcSpecialCheckLog.getLetterCommitmentState() != null && !smcSpecialCheckLog.getLetterCommitmentState().equals(smcSpecialCheckLogHistory.getLetterCommitmentState())){
                         specialExaminationExport.setLetterCommitmentStateIs(1);
                     }
-                    if (smcSpecialCheckLog.getNumberCardState() != null && !smcSpecialCheckLog.getNumberCardState().equals(smcSpecialCheckLogHistory.getNumberCardState())){
+                    }
+                    if (smcSpecialCheckLog.getBusinessLicenseState() != null && !smcSpecialCheckLog.getBusinessLicenseState().equals(smcSpecialCheckLogHistory.getBusinessLicenseState())){
                         specialExaminationExport.setBusinessLicenseStateIs(1);
                     }
                     if (smcSpecialCheckLog.getLetterIntroductionState() != null && !smcSpecialCheckLog.getLetterIntroductionState().equals(smcSpecialCheckLogHistory.getLetterIntroductionState())){

tnc-sms/src/main/java/org/jeecg/modules/smscheck/entity/SmcSpecialCheckLog.java

@@ -57,6 +57,10 @@ public class SmcSpecialCheckLog  implements Serializable {
     private Integer numberCardState;
     /**  */
     private String numberCardNote;
+    /** 手持号卡 */
+    private Integer handNumberCardState;
+    /**  */
+    private String handNumberCardNote;
     /** 防诈骗承诺函 */
     private Integer letterCommitmentState;
     /**  */

tnc-sms/src/main/java/org/jeecg/modules/smscheck/entity/SmcSpecialCheckLogHistory.java

@@ -55,8 +55,11 @@ public class SmcSpecialCheckLogHistory implements Serializable {
     private String handCertificateNote;
     /** 号卡 */
     private Integer numberCardState;
+    /** 手持号卡 */
+    private Integer handNumberCardState;
     /**  */
     private String numberCardNote;
+    private String handNumberCardNote;
     /** 防诈骗承诺函 */
     private Integer letterCommitmentState;
     /**  */

tnc-sms/src/main/java/org/jeecg/modules/smscheck/entity/SmcSpecialCheckLogStateVo.java

@@ -24,6 +24,8 @@ public class SmcSpecialCheckLogStateVo {
     private Integer handCertificateState;
     /** 号卡 */
     private Integer numberCardState;
+    /** 号卡 */
+    private Integer handNumberCardState;
     /** 防诈骗承诺函 */
     private Integer letterCommitmentState;
     /** 营业执照副本 */

tnc-sms/src/main/java/org/jeecg/modules/smscheck/entity/SpecialExamination.java

@@ -68,6 +68,10 @@ public class SpecialExamination implements Serializable {
     private String numberCard;
     private String numberCardRemark;
     @MyCustomAnnotation
+    @ApiModelProperty(value = "手持号卡")
+    private String handNumberCard;
+    private String handNumberCardRemark;
+    @MyCustomAnnotation
     @ApiModelProperty(value = "防诈骗承诺涵")
     private String letterCommitment;
     private String letterCommitmentRemark;

tnc-sms/src/main/java/org/jeecg/modules/smscheck/entity/excel/SpecialExaminationExport.java

@@ -69,6 +69,10 @@ public class SpecialExaminationExport {
     private Integer numberCardState;
     @Excel(name = "号卡稽核备注", width = 20)
     private String numberCardNote;
+    @Excel(name = "号卡稽核结果", width = 20 , dicCode = "special_check_state")
+    private Integer handNumberCardState;
+    @Excel(name = "号卡稽核备注", width = 20)
+    private String handNumberCardNote;
     /** 防诈骗承诺函 */
     @Excel(name = "防诈骗承诺函稽核结果", width = 20 , dicCode = "special_check_state")
     private Integer letterCommitmentState;
@@ -113,6 +117,8 @@ public class SpecialExaminationExport {
     private Integer handCertificateStateIs;
     @Excel(name = "号卡稽核结果是否整改", width = 20 , dicCode = "special_check_state_is")
     private Integer numberCardStateIs;
+    @Excel(name = "手持号卡稽核结果是否整改", width = 20 , dicCode = "special_check_state_is")
+    private Integer handNumberCardStateIs;
     /** 防诈骗承诺函 */
     @Excel(name = "防诈骗承诺函稽核结果是否整改", width = 20 , dicCode = "special_check_state_is")
     private Integer letterCommitmentStateIs;

tnc-system/src/main/java/org/jeecg/modules/system/controller/SysRoleController.java

@@ -416,8 +416,26 @@ public class SysRoleController {
 			if(sysRolePermission==null) {
 				return Result.error("请先保存角色菜单权限!");
 			}else {
-				sysRolePermission.setDataRuleIds(dataRuleIds);
-				this.sysRolePermissionService.updateById(sysRolePermission);
+				LambdaQueryWrapper<SysRolePermission> sysRolePermissionLambdaQueryWrapper = new LambdaQueryWrapper<>();
+				sysRolePermissionLambdaQueryWrapper.eq(SysRolePermission::getRoleId,roleId);
+				List<SysRolePermission> dataRuleList = sysRolePermissionService.list(sysRolePermissionLambdaQueryWrapper);
+				String dataRuleIdOld = null;
+				for (SysRolePermission dataRule : dataRuleList){
+					String ids = dataRule.getDataRuleIds();
+					if (StringUtils.isNotBlank(ids)){
+						String[] idsSplit = ids.split(",");
+						if (idsSplit.length == 1){
+							dataRuleIdOld = idsSplit[0];
+							continue;
+						}
+					}
+				}
+				if (StringUtils.isNotBlank(dataRuleIdOld)){
+					dataRuleIds = dataRuleIds + "," + dataRuleIdOld;
+					sysRolePermission.setDataRuleIds(dataRuleIds);
+					this.sysRolePermissionService.updateById(sysRolePermission);
+				}
+
 			}
 		} catch (Exception e) {
 			log.error("SysRoleController.saveDatarule()发生异常：" + e.getMessage(),e);