劳务费导入修改

yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/entity/TSalaryStandard.java

@@ -165,6 +165,13 @@ public class TSalaryStandard extends BaseEntity {
 	@ExcelAttribute(name = "最终审核时间", isDate = true)
 	@ExcelProperty("最终审核时间")
 	private Date auditTime;
+	/**
+	 * 审核意见
+	 */
+	@ExcelAttribute(name = "审核意见", maxLength = 500)
+	@Length(max = 500, message = "审核意见不能超过500个字符")
+	@ExcelProperty("审核意见")
+	private String auditRemark;
 	/**
 	 * 省
 	 */

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryStandardServiceImpl.java

@@ -269,7 +269,7 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
 				tApprovalRecord.setApprovalResult(CommonConstants.ONE_STRING);
 			}
 			if (Common.isNotNull(auditRemark)) {
-				tSalaryStandard.setRemark(auditRemark);
+				tSalaryStandard.setAuditRemark(auditRemark);
 				tApprovalRecord.setApprovalOpinion(auditRemark);
 			}
 			tSalaryStandard.setAuditUser(user.getId());
@@ -280,6 +280,7 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
 			tApprovalRecord.setApprovalMan(user.getId());
 			tApprovalRecord.setApprovalManName(user.getNickname());
 			tApprovalRecord.setApprovalTime(DateUtil.getCurrentDateTime());
+			tApprovalRecord.setNodeId("审核");
 			approvalRecordService.save(tApprovalRecord);
 		}
 		return R.ok();

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

@@ -41,6 +41,7 @@
     <result property="deleteFlag" column="DELETE_FLAG"/>
     <result property="auditUser" column="AUDIT_USER"/>
     <result property="auditTime" column="AUDIT_TIME"/>
+    <result property="auditRemark" column="AUDIT_REMARK"/>
     <result property="province" column="PROVINCE"/>
     <result property="city" column="CITY"/>
     <result property="town" column="TOWN"/>
@@ -82,6 +83,7 @@
                 a.DELETE_FLAG,
                 a.AUDIT_USER,
                 a.AUDIT_TIME,
+                a.AUDIT_REMARK,
                 a.PROVINCE,
                 a.CITY,
                 a.TOWN,
@@ -159,6 +161,9 @@
                     <if test="tSalaryStandard.auditTime != null">
                         AND a.AUDIT_TIME = #{tSalaryStandard.auditTime}
                     </if>
+					<if test="tSalaryStandard.auditReamrk != null and tSalaryStandard.auditReamrk.trim() != ''">
+						AND a.AUDIT_REAMRK = #{tSalaryStandard.auditReamrk}
+					</if>
                     <if test="tSalaryStandard.province != null">
                         AND a.PROVINCE = #{tSalaryStandard.province}
                     </if>