面损表查询字段更新

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/costLossReview/mapper/xml/SyCostLossReviewMapper.xml

@@ -118,7 +118,7 @@
     </select>
 
     <select id="querySyFabricLossReport" resultType="org.jeecg.modules.documents.costLossReview.entity.FabricLossReview">
-        select plan_code as cCode,create_time as createTime,approval_date as approvalDate,approval_man as approvalMan,
+        select plan_code as cCode,create_time as createTime,first_approve_date as approvalDate,first_approve_by as approvalMan,
                  content ->> '$.cDefine22'  AS cDefine22, content ->> '$.planner'  as planner,
                  content ->> '$.number' as number, content ->> '$.contractNo' as contractNo,
                  content ->> '$.cPersonName' as cPersonName,
@@ -130,10 +130,10 @@
             AND date_format( create_time, '%Y-%m-%d' )= date_format(#{sy.createTime},'%Y-%m-%d');
         </if>
         <if test="sy.approvalMan != null and sy.approvalMan !=''">
-            AND approval_man = #{sy.approvalMan}
+            AND first_approve_by = #{sy.approvalMan}
         </if>
         <if test="sy.approvalDate != null and sy.approvalDate !=''">
-            AND approval_date = #{sy.approvalDate}
+            AND first_approve_date = #{sy.approvalDate}
         </if>
         <if test="sy.cCode != null and sy.cCode !=''">
             AND plan_code = #{sy.cCode}
@@ -162,7 +162,7 @@
     </select>
 
     <select id="queryCostAllocation" resultType="org.jeecg.modules.documents.costLossReview.entity.CostAllocationReview">
-        select plan_num as planNum,approval_date as approvalDate,approval_man as approvalMan,add_date as addDate,
+        select plan_num as planNum,first_approve_date as approvalDate,first_approve_by as approvalMan,add_date as addDate,
         cost_info ->> '$.poStyleNum'  AS poStyleNum,
         cost_info ->> '$.exportSales'  AS exportSales,
         cost_info ->> '$.garmentContractno'  AS garmentContractno,
@@ -182,10 +182,10 @@
             AND date_format( add_date, '%Y-%m-%d' )= date_format(#{sy.addDate},'%Y-%m-%d');
         </if>
         <if test="sy.approvalMan != null and sy.approvalMan !=''">
-            AND approval_man = #{sy.approvalMan}
+            AND first_approve_by = #{sy.approvalMan}
         </if>
         <if test="sy.approvalDate != null and sy.approvalDate !=''">
-            AND approval_date = #{sy.approvalDate}
+            AND first_approve_date = #{sy.approvalDate}
         </if>
         <if test="sy.planNum != null and sy.planNum !=''">
             AND plan_num = #{sy.planNum}