feature-wzb :合同审核模块新增功能

yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeContractExportVO.java

@@ -191,6 +191,18 @@ public class EmployeeContractExportVO implements Serializable {
 	@Schema(description = "审核状态")
 	private String auditStatus;
 
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelAttribute(name = "不通过原因")
+	@Schema(description = "不通过原因")
+	@ExcelProperty("不通过原因")
+	private String noPassReason;
+
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelAttribute(name = "审核说明")
+	@Schema(description = "审核说明")
+	@ExcelProperty("审核说明")
+	private String remark;
+
 	@HeadFontStyle(fontHeightInPoints = 11)
 	@ExcelProperty("合同状态")
 	@ExcelAttribute(name = "合同状态", readConverterExp = "0=可用,1=不可用")
@@ -268,4 +280,5 @@ public class EmployeeContractExportVO implements Serializable {
 	@Schema(description = "导出的表头的Set")
 	private Set<String> exportFields;
 
+
 }

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractInfoServiceImpl.java

@@ -1404,6 +1404,22 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
 						contractInfo.setLimitEnd(CommonConstants.EXCEL_EXPORT_LIMIT);
 						list = baseMapper.getTEmployeeContractExport(contractInfo);
 						if (Common.isNotNull(list)) {
+
+							for(EmployeeContractExportVO ll:list){
+								if(ll.getAuditStatus().contains("审核不通过")) {
+									if (null != ll.getRemark()) {
+										String[] a = ll.getRemark().split(":");
+										for(int t=0;t<a.length;t++){
+											if(t==1) {
+												ll.setNoPassReason(a[0]);
+												ll.setRemark(a[1]);
+											}
+
+										}
+
+									}
+								}
+							}
 							writeSheet = EasyExcel.writerSheet("员工合同" + index).build();
 							excelWriter.write(list, writeSheet);
 							index++;

yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeContractInfoMapper.xml

@@ -140,6 +140,7 @@
 		<result property="contractNo" column="CONTRACT_NO"/>
 		<result property="workingHours" column="WORKING_HOURS"/>
 		<result property="post" column="POST"/>
+		<result property="remark" column="REMARK"/>
 	</resultMap>
 
 	<sql id="Base_Column_List">
@@ -226,6 +227,7 @@
 		a.CONTRACT_PARTY,
 		a.SUBJECT_UNIT,
 		a.AUDIT_STATUS,
+		b.REMARK,
 		a.IN_USE,
 		if(a.IS_FILE = 0,'有附件','无附件') FILES,
 		a.IS_FILE,
@@ -399,9 +401,7 @@
 			<if test="tEmployeeContractInfo.applyNo != null and tEmployeeContractInfo.applyNo.trim() != ''">
 				AND a.APPLY_NO = #{tEmployeeContractInfo.applyNo}
 			</if>
-			<if test="tEmployeeContractInfo.auditStatus != null">
-				AND a.AUDIT_STATUS = #{tEmployeeContractInfo.auditStatus}
-			</if>
+
 			<if test="tEmployeeContractInfo.empNatrue != null and tEmployeeContractInfo.empNatrue.trim() != ''">
 				AND a.EMP_NATRUE = #{tEmployeeContractInfo.empNatrue}
 			</if>
@@ -426,8 +426,10 @@
 		SELECT
 			<include refid="Base_Column_List"/>
 		FROM t_employee_contract_info a
+		join t_employee_contract_audit b on a.ID=b.LINK_ID
 		<where>
 			a.DELETE_FLAG = 0
+			and b.ROOT_NAME='合同审核'
 			<include refid="tEmployeeContractInfo_where"/>
 			<if test="tEmployeeContractInfo.authSql != null and tEmployeeContractInfo.authSql.trim() != ''">
 				${tEmployeeContractInfo.authSql}
@@ -441,6 +443,9 @@
 		SELECT
 			<include refid="Base_Column_List"/>
 		FROM t_employee_contract_info a
+		  join t_employee_contract_audit b on a.ID=b.LINK_ID
+
+
 		<where>
 			a.DELETE_FLAG = 0
 			<include refid="tEmployeeContractInfo_where"/>
@@ -453,8 +458,10 @@
 		SELECT
 		count(1)
 		FROM t_employee_contract_info a
+		join t_employee_contract_audit b on a.ID=b.LINK_ID
 		<where>
 			a.DELETE_FLAG = 0
+			and b.ROOT_NAME='合同审核'
 			<include refid="tEmployeeContractInfo_where"/>
 			<if test="tEmployeeContractInfo.authSql != null and tEmployeeContractInfo.authSql.trim() != ''">
 				${tEmployeeContractInfo.authSql}
@@ -504,13 +511,16 @@
 		WHEN a.type =3 THEN "派减-作废"
 		WHEN a.type =4 THEN "派减-终止"
 		ELSE a.type END as "type",
+		b.REMARK,
 		a.CREATE_TIME
 		FROM t_employee_contract_info a
 		LEFT JOIN sys_area a1 on a1.id=a.FILE_PROVINCE
 		LEFT JOIN sys_area a2 on a2.id=a.FILE_CITY
 		LEFT JOIN sys_area a3 on a3.id=a.FILE_TOWN
+		  join t_employee_contract_audit b on a.ID=b.LINK_ID
 		<where>
 			a.DELETE_FLAG = 0
+			and b.ROOT_NAME='合同审核'
 			<include refid="tEmployeeContractInfo_where"/>
 			<if test="tEmployeeContractInfo.authSql != null and tEmployeeContractInfo.authSql.trim() != ''">
 				${tEmployeeContractInfo.authSql}
@@ -645,10 +655,17 @@
 		a.TYPE,
 		a.LEAVE_DATE,
 		a.CONTRACT_NO,
-		a.REDUCE_REASON
+		a.REDUCE_REASON,
+		b.AUDIT_STATUS,
+		b.REMARK
+
 		FROM t_employee_contract_info a
+		  join t_employee_contract_audit b on a.ID=b.LINK_ID
+
+
 		<where>
 			a.DELETE_FLAG = 0
+			and b.ROOT_NAME='合同审核'
 			<include refid="tEmployeeContractInfo_where"/>
 			<if test="tEmployeeContractInfo.authSql != null and tEmployeeContractInfo.authSql.trim() != ''">
 				${tEmployeeContractInfo.authSql}
@@ -666,8 +683,10 @@
 		SELECT
 		count(1)
 		FROM t_employee_contract_info a
+		 join t_employee_contract_audit b on a.ID=b.LINK_ID
 		<where>
 			a.DELETE_FLAG = 0
+			and b.ROOT_NAME='合同审核'
 			<include refid="tEmployeeContractInfo_where"/>
 			<if test="tEmployeeContractInfo.authSql != null and tEmployeeContractInfo.authSql.trim() != ''">
 				${tEmployeeContractInfo.authSql}