Merge branch 'develop' into feature-licancan

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/controller/TSalaryStandardController.java

@@ -30,6 +30,7 @@ import com.yifu.cloud.plus.v1.yifu.salary.entity.TApprovalRecord;
 import com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryStandard;
 import com.yifu.cloud.plus.v1.yifu.salary.service.TApprovalRecordService;
 import com.yifu.cloud.plus.v1.yifu.salary.service.TSalaryStandardService;
+import com.yifu.cloud.plus.v1.yifu.salary.util.SalaryConstants;
 import com.yifu.cloud.plus.v1.yifu.salary.vo.TSalaryStandardSearchVo;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -159,23 +160,32 @@ public class TSalaryStandardController {
 	@PostMapping("/doSubmit")
 	public R salaryStandardAudit(@RequestBody TSalaryStandard tSalaryStandard) {
 		if (tSalaryStandard != null && Common.isNotNull(tSalaryStandard.getId())) {
-			YifuUser user = SecurityUtils.getUser();
-			if (user != null) {
-				TApprovalRecord tApprovalRecord = new TApprovalRecord();
-				tApprovalRecord.setApprovalResult(CommonConstants.TWO_STRING);
-				tApprovalRecord.setApprovalOpinion("提交审核");
-				tApprovalRecord.setSalaryId(tSalaryStandard.getId());
-				tApprovalRecord.setNodeId("提交审核");
-				tApprovalRecord.setApprovalMan(user.getId());
-				tApprovalRecord.setApprovalManName(user.getNickname());
-				tApprovalRecord.setApprovalTime(DateUtil.getCurrentDateTime());
-				auditLogService.save(tApprovalRecord);
-				tSalaryStandard.setSubmitTime(new Date());
-				tSalaryStandard.setStatus(CommonConstants.ONE_INT);
-				tSalaryStandardService.updateById(tSalaryStandard);
-				return R.ok("提交成功！");
+			TSalaryStandard s = tSalaryStandardService.getById(tSalaryStandard.getId());
+			if (s == null) {
+				return R.failed("未找到工资表");
+			} else if (s.getStatus() == SalaryConstants.STATUS[0]
+					|| s.getStatus() == SalaryConstants.STATUS[5]
+					|| s.getStatus() == SalaryConstants.STATUS[7]) {
+				YifuUser user = SecurityUtils.getUser();
+				if (user != null) {
+					TApprovalRecord tApprovalRecord = new TApprovalRecord();
+					tApprovalRecord.setApprovalResult(CommonConstants.TWO_STRING);
+					tApprovalRecord.setApprovalOpinion("提交审核");
+					tApprovalRecord.setSalaryId(tSalaryStandard.getId());
+					tApprovalRecord.setNodeId("提交审核");
+					tApprovalRecord.setApprovalMan(user.getId());
+					tApprovalRecord.setApprovalManName(user.getNickname());
+					tApprovalRecord.setApprovalTime(DateUtil.getCurrentDateTime());
+					auditLogService.save(tApprovalRecord);
+					tSalaryStandard.setSubmitTime(new Date());
+					tSalaryStandard.setStatus(CommonConstants.ONE_INT);
+					tSalaryStandardService.updateById(tSalaryStandard);
+					return R.ok("提交成功！");
+				} else {
+					return R.failed("请登录！");
+				}
 			} else {
-				return R.failed("请登录！");
+				return R.failed("请刷新后检查薪资表状态！");
 			}
 		} else {
 			return R.failed("请传参！");

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/util/SalaryConstants.java

@@ -33,6 +33,7 @@ public class SalaryConstants {
       * @return:
       **/
      public static final Integer[] AUDIT_STATUS = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
+     public static final int[] STATUS = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
      public static final String[] AUDIT_STATUS_STRING = {"待提交", "待审核", "-", "待发放", "已发放", "审核不通过", "确认不通过", "财务退回", "结算单调整待审核", "结算单调整待打印"};
      //发放失败-认领状态 0待认领1待出账2已发放3再次失败待认领
      public static final Integer[] LOST_STATUS = {0, 1, 2, 3};

yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryStandardMapper.xml

@@ -294,7 +294,7 @@
 	<sql id="where_page">
 		<if test="tSalaryStandard != null">
 			<if test="tSalaryStandard.deptName != null and tSalaryStandard.deptName.trim() != ''">
-				AND a.DEPT_NAME like concat(#{'%',#{tSalaryStandard.deptName},'%')
+				AND a.DEPT_NAME like concat('%',#{tSalaryStandard.deptName},'%')
 			</if>
 			<if test="tSalaryStandard.deptNo != null and tSalaryStandard.deptNo.trim() != ''">
 				AND a.DEPT_NO = #{tSalaryStandard.deptNo}
@@ -313,7 +313,7 @@
 	<sql id="where_export">
 		<if test="searchVo != null">
 			<if test="searchVo.deptName != null and searchVo.deptName.trim() != ''">
-				AND a.DEPT_NAME like concat(#{'%',#{searchVo.deptName},'%')
+				AND a.DEPT_NAME like concat('%',#{searchVo.deptName},'%')
 			</if>
 			<if test="searchVo.deptNo != null and searchVo.deptNo.trim() != ''">
 				AND a.DEPT_NO = #{searchVo.deptNo}