派单处理

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TAuditInfo.java

@@ -134,4 +134,26 @@ public class TAuditInfo implements Serializable {
 	@ExcelProperty("type类型" )
 	private String type;
 
+
+	/**
+	 * 部门---员工所在部门
+	 */
+	@ExcelAttribute(name = "部门")
+	@Schema(description = "部门---员工所在部门" )
+	private String organName;
+
+	/**
+	 * 操作内容
+	 */
+	@ExcelAttribute(name = "操作内容")
+	@Schema(description = "操作内容" )
+	private String title;
+
+	/**
+	 * 颜色： red  green  yellow  grey
+	 */
+	@ExcelAttribute(name = "颜色")
+	@Schema(description = "颜色： red  green  yellow  grey" )
+	private String color;
+
 }

yifu-social/yifu-social-biz/src/main/resources/mapper/TAuditInfoMapper.xml

@@ -32,10 +32,9 @@
     <result property="auditTime" column="AUDIT_TIME"/>
     <result property="isCommision" column="IS_COMMISION"/>
     <result property="providentId" column="PROVIDENT_ID"/>
-    <result property="cardinalId" column="CARDINAL_ID"/>
-    <result property="forecastFormId" column="FORECAST_FORM_ID"/>
-    <result property="empLeaveId" column="EMP_LEAVE_ID"/>
-    <result property="aprovalFormId" column="APROVAL_FORM_ID"/>
+    <result property="organName" column="ORGAN_NAME"/>
+    <result property="title" column="TITLE"/>
+    <result property="color" column="COLOR"/>
     <result property="dispatchInfoId" column="DISPATCH_INFO_ID"/>
     <result property="type" column="TYPE"/>
   </resultMap>
@@ -48,10 +47,9 @@
                 a.AUDIT_TIME,
                 a.IS_COMMISION,
                 a.PROVIDENT_ID,
-                a.CARDINAL_ID,
-                a.FORECAST_FORM_ID,
-                a.EMP_LEAVE_ID,
-                a.APROVAL_FORM_ID,
+                a.ORGAN_NAME,
+                a.TITLE,
+                a.COLOR,
                 a.DISPATCH_INFO_ID,
                 a.TYPE
     </sql>
@@ -81,18 +79,6 @@
                     <if test="tAuditInfo.providentId != null and tAuditInfo.providentId.trim() != ''">
                         AND a.PROVIDENT_ID = #{tAuditInfo.providentId}
                     </if>
-                    <if test="tAuditInfo.cardinalId != null and tAuditInfo.cardinalId.trim() != ''">
-                        AND a.CARDINAL_ID = #{tAuditInfo.cardinalId}
-                    </if>
-                    <if test="tAuditInfo.forecastFormId != null and tAuditInfo.forecastFormId.trim() != ''">
-                        AND a.FORECAST_FORM_ID = #{tAuditInfo.forecastFormId}
-                    </if>
-                    <if test="tAuditInfo.empLeaveId != null and tAuditInfo.empLeaveId.trim() != ''">
-                        AND a.EMP_LEAVE_ID = #{tAuditInfo.empLeaveId}
-                    </if>
-                    <if test="tAuditInfo.aprovalFormId != null and tAuditInfo.aprovalFormId.trim() != ''">
-                        AND a.APROVAL_FORM_ID = #{tAuditInfo.aprovalFormId}
-                    </if>
                     <if test="tAuditInfo.dispatchInfoId != null and tAuditInfo.dispatchInfoId.trim() != ''">
                         AND a.DISPATCH_INFO_ID = #{tAuditInfo.dispatchInfoId}
                     </if>