Commit 93fea044 authored by huyuchen's avatar huyuchen

Merge remote-tracking branch 'origin/MVP1.7.5' into MVP1.7.5

parents 7102bb74 d549434f
...@@ -1477,8 +1477,10 @@ ...@@ -1477,8 +1477,10 @@
EMP_IDCARD_NO EMP_IDCARD_NO
FROM t_insurance_detail d FROM t_insurance_detail d
where DELETE_FLAG = 0 where DELETE_FLAG = 0
and (d.BUY_HANDLE_STATUS in (1,2) or (d.BUY_HANDLE_STATUS = 3 and d.IS_EFFECT = 0)) and (d.BUY_HANDLE_STATUS in (1,2) or (d.BUY_HANDLE_STATUS = 3 and d.IS_EFFECT = 0
and d.POLICY_EFFECT <![CDATA[ <= ]]> NOW() and d.POLICY_END >= NOW() and d.POLICY_EFFECT <![CDATA[ <= ]]> NOW() and d.POLICY_END >= NOW()
))
<if test="idCardList != null and idCardList.size > 0"> <if test="idCardList != null and idCardList.size > 0">
AND EMP_IDCARD_NO in AND EMP_IDCARD_NO in
<foreach item="item" index="index" collection="idCardList" open="(" separator="," close=")"> <foreach item="item" index="index" collection="idCardList" open="(" separator="," close=")">
......
...@@ -506,6 +506,14 @@ public class TSalaryStandard extends BaseEntity { ...@@ -506,6 +506,14 @@ public class TSalaryStandard extends BaseEntity {
@ExcelProperty("是否校验商险") @ExcelProperty("是否校验商险")
private Integer isCheckRisk; private Integer isCheckRisk;
/**
* 校验商险通过的原因
*/
@ExcelAttribute(name = "校验商险通过的原因")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("校验商险通过的原因")
private String checkRiskRemark;
/** /**
* 工资月份-起 * 工资月份-起
*/ */
......
...@@ -145,23 +145,6 @@ public class TInsuranceUnpurchaseApplyController { ...@@ -145,23 +145,6 @@ public class TInsuranceUnpurchaseApplyController {
return R.ok(tInsuranceUnpurchaseApplyService.getAuditPage(page, unpurchaseApplySearchVo, userId, type)); return R.ok(tInsuranceUnpurchaseApplyService.getAuditPage(page, unpurchaseApplySearchVo, userId, type));
} }
/**
* 审核分页查询(小程序)
*
* @param page 分页对象
* @param unpurchaseApplySearchVo 不购买申请查询信息
* @param type 0待审核、1已处理、2抄送我
*
* @return R
*/
@Operation(description = "审核分页查询(小程序临时)")
@GetMapping("/getAuditPageTemp")
public R<IPage<TInsuranceUnpurchaseApply>> getAuditPageTemp(Page<TInsuranceUnpurchaseApply> page,
TInsuranceUnpurchaseApplySearchVo unpurchaseApplySearchVo,
String type,String userId) {
return R.ok(tInsuranceUnpurchaseApplyService.getAuditPage(page, unpurchaseApplySearchVo, userId, type));
}
/** /**
* 审核数量 * 审核数量
* *
...@@ -169,12 +152,12 @@ public class TInsuranceUnpurchaseApplyController { ...@@ -169,12 +152,12 @@ public class TInsuranceUnpurchaseApplyController {
*/ */
@Operation(description = "审核数量查询") @Operation(description = "审核数量查询")
@GetMapping("/getAuditCount") @GetMapping("/getAuditCount")
public R<Map<String,Integer>> getAuditCount(String userId) { public R<Map<String,Integer>> getAuditCount() {
// YifuUser user = SecurityUtils.getUser(); YifuUser user = SecurityUtils.getUser();
// if(null == user){ if(null == user){
// return R.failed(ResultConstants.NO_USER); return R.failed(ResultConstants.NO_USER);
// } }
// String userId = String.valueOf(user.getId()); String userId = String.valueOf(user.getId());
return R.ok(tInsuranceUnpurchaseApplyService.getAuditCount(userId)); return R.ok(tInsuranceUnpurchaseApplyService.getAuditCount(userId));
} }
...@@ -254,44 +237,4 @@ public class TInsuranceUnpurchaseApplyController { ...@@ -254,44 +237,4 @@ public class TInsuranceUnpurchaseApplyController {
return R.failed(ResultConstants.REQUEST_LOCK_FAIL); return R.failed(ResultConstants.REQUEST_LOCK_FAIL);
} }
/**
* 审核(小程序临时)
* @param tAuditRecord 审批信息
* @return R<String>
**/
@Operation(description = "审核(小程序临时)")
@SysLog("审核(小程序临时)")
@PostMapping("/auditTemp")
public R<String> auditTemp(@RequestBody TAuditRecord tAuditRecord) {
if (Common.isEmpty(tAuditRecord.getApprovalResult())) {
return R.failed("审核结果不能为空!");
}
if (Common.isNotNull(tAuditRecord.getApprovalOpinion()) && tAuditRecord.getApprovalOpinion().length()> 100) {
return R.failed("审核意见不能超过100个字");
}
if (Common.isEmpty(tAuditRecord.getDomainId())) {
return R.failed("id不能为空!");
}
// YifuUser user = SecurityUtils.getUser();
// if (Common.isEmpty(user)){
// return R.failed(CommonConstants.USER_FAIL);
// }
TInsuranceUnpurchaseApply insuranceUnpurchaseApply = tInsuranceUnpurchaseApplyService.getById(tAuditRecord.getDomainId());
if (Common.isEmpty(insuranceUnpurchaseApply)){
return R.failed("该实体信息不存在!");
}
String requestId;
String redisKey = CacheConstants.INSURANCEUNPURCHASE_PROCESS_CACHE.concat(tAuditRecord.getDomainId());
try {
requestId = RedisDistributedLock.tryLockAndTime(redisKey, "10");
} catch (Exception e) {
return R.failed(ResultConstants.REQUEST_LOCK_FAIL);
}
if (Common.isNotKong(requestId)) {
return R.ok("审核完毕");
}
return R.failed(ResultConstants.REQUEST_LOCK_FAIL);
}
} }
...@@ -1180,19 +1180,19 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe ...@@ -1180,19 +1180,19 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
if (!updatePerSonSalaryList.isEmpty()) { if (!updatePerSonSalaryList.isEmpty()) {
tInsuranceUnpurchasePersonSalaryService.saveBatch(updatePerSonSalaryList); tInsuranceUnpurchasePersonSalaryService.saveBatch(updatePerSonSalaryList);
} }
return getTrueR(s, "校验通过"); return getTrueR(s, "校验【商险不购买】通过");
} else { } else {
return new R<>(CommonConstants.TWO_INT, "校验商险不通过!", returnList); return new R<>(CommonConstants.TWO_INT, "校验【商险不购买】不通过!", returnList);
} }
} else { } else {
return getTrueR(s, "均已购买商险"); return getTrueR(s, "均已购买【商险】");
} }
} }
} else { } else {
return getTrueR(s, "没有报账明细,无需拦截"); return getTrueR(s, "没有报账明细,无需拦截");
} }
} else { } else {
return getTrueR(s, "项目不含风险无商险"); return getTrueR(s, "项目不含风险无商险");
} }
} else { } else {
return R.failed("获取项目信息失败,请联管理员!"); return R.failed("获取项目信息失败,请联管理员!");
...@@ -1207,6 +1207,7 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe ...@@ -1207,6 +1207,7 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
**/ **/
private R<List<SalaryRiskVo>> getTrueR(TSalaryStandard s, String msg) { private R<List<SalaryRiskVo>> getTrueR(TSalaryStandard s, String msg) {
s.setIsCheckRisk(CommonConstants.ONE_INT); s.setIsCheckRisk(CommonConstants.ONE_INT);
s.setCheckRiskRemark(msg);
this.updateById(s); this.updateById(s);
return R.ok(null, msg); return R.ok(null, msg);
} }
......
...@@ -50,10 +50,6 @@ security: ...@@ -50,10 +50,6 @@ security:
- /salaryEmployeeSelect/getSalaryAccount # 工资条查询明细通过openId控制 - /salaryEmployeeSelect/getSalaryAccount # 工资条查询明细通过openId控制
- /tsalaryatta/ossUploadFile # 工资条查询附件上传 无token - /tsalaryatta/ossUploadFile # 工资条查询附件上传 无token
- /tsalaryatta/ossFileDelete/** # 工资条查询附件上传删除 无token - /tsalaryatta/ossFileDelete/** # 工资条查询附件上传删除 无token
- /tinsuranceunpurchaseapply/getAuditPageTemp # 临时调试
- /tinsuranceunpurchaseapply/getAuditCount # 临时调试
- /tinsuranceunpurchaseapply/auditTemp # 临时调试
- /tauditrecord/getAuditInfoByDomainIdAndAuditType # 临时调试
- /tinsuranceunpurchaseapply/temp/{id} # 临时调试 - /tinsuranceunpurchaseapply/temp/{id} # 临时调试
......
...@@ -90,6 +90,7 @@ ...@@ -90,6 +90,7 @@
<result property="newEmpUpdateFlag" column="NEW_EMP_UPDATE_FLAG"/> <result property="newEmpUpdateFlag" column="NEW_EMP_UPDATE_FLAG"/>
<result property="isFixedColumn" column="IS_FIXED_COLUMN"/> <result property="isFixedColumn" column="IS_FIXED_COLUMN"/>
<result property="isCheckRisk" column="IS_CHECK_RISK"/> <result property="isCheckRisk" column="IS_CHECK_RISK"/>
<result property="checkRiskRemark" column="CHECK_RISK_REMARK"/>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
a.ID, a.ID,
...@@ -157,7 +158,8 @@ ...@@ -157,7 +158,8 @@
a.ORIGINAL_SET_NAME, a.ORIGINAL_SET_NAME,
a.NEW_EMP_UPDATE_FLAG, a.NEW_EMP_UPDATE_FLAG,
a.IS_FIXED_COLUMN, a.IS_FIXED_COLUMN,
a.IS_CHECK_RISK a.IS_CHECK_RISK,
a.CHECK_RISK_REMARK
</sql> </sql>
<sql id="tSalaryStandard_where"> <sql id="tSalaryStandard_where">
<if test="tSalaryStandard != null"> <if test="tSalaryStandard != null">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment