成本面损列表

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/costLossReview/controller/SyCostLossReviewController.java

@@ -53,6 +53,7 @@ public class SyCostLossReviewController extends JeecgController<SyOrderData, ISy
        Page<SyCostLossReview> page = new Page<SyCostLossReview>(pageNo, pageSize);
        IPage<SyCostLossReview> pageList = syCostLossReviewService.querylist(syCostLossReview,page);
        for (SyCostLossReview sy:pageList.getRecords()) {
+           //赋值制单人
            List<String> list=syCostLossReviewService.queryMakerByplanNo(sy.getPlanNo());
            if(list.size()==0){
                sy.setMaker("");
@@ -65,6 +66,26 @@ public class SyCostLossReviewController extends JeecgController<SyOrderData, ISy
                    }
                }
            }
+           //赋值面损审批数据
+           SyCostLossReview f = syCostLossReviewService.querySyFabricLossByCode(sy.getPlanNo());
+           if(f!=null){
+               sy.setFsubmitDate(f.getFsubmitDate());
+               sy.setFfirstApproveDate(f.getFfirstApproveDate());
+               sy.setFfinalApproveDate(f.getFfinalApproveDate());
+               sy.setFrejectDate(f.getFrejectDate());
+               sy.setFstatus(f.getFstatus());
+           }
+
+           //赋值成本审批数据
+           SyCostLossReview c = syCostLossReviewService.queryCostAllocationByCode(sy.getPlanNo());
+           if(c!=null){
+               sy.setCsubmitDate(c.getCsubmitDate());
+               sy.setCfirstApproveDate(c.getCfirstApproveDate());
+               sy.setCfinalApproveDate(c.getCfinalApproveDate());
+               sy.setCrejectDate(c.getCrejectDate());
+               sy.setCstatus(c.getCstatus());
+           }
+
        }
        return Result.OK(pageList);
    }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/costLossReview/entity/SyCostLossReview.java

@@ -12,9 +12,9 @@ import org.springframework.format.annotation.DateTimeFormat;
 import java.util.Date;
 
 /**
- * @Description: 订单主表
+ * @Description: 成本损失列表
  * @Author: jeecg-boot
- * @Date:   2022-04-21
+ * @Date:   2023-03-21
  * @Version: V1.0
  */
 @Data
@@ -46,4 +46,24 @@ public class SyCostLossReview {
 	@ApiModelProperty(value = "制单人")
 	private String maker;
 
+	private String fsubmitDate;
+
+	private String frejectDate;
+
+	private String ffirstApproveDate;
+
+	private String ffinalApproveDate;
+
+	private String fstatus;
+
+	private String csubmitDate;
+
+	private String crejectDate;
+
+	private String cfirstApproveDate;
+
+	private String cfinalApproveDate;
+
+	private String cstatus;
+
 }

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

@@ -25,4 +25,7 @@ public interface SyCostLossReviewMapper extends BaseMapper<SyCostLossReview> {
 
     IPage<FabricLossReview> querySyFabricLossReport(@Param("sy")FabricLossReview sy, Page<FabricLossReview> page);
     IPage<CostAllocationReview> queryCostAllocation(@Param("sy")CostAllocationReview sy, Page<CostAllocationReview> page);
+
+    SyCostLossReview querySyFabricLossByCode(@Param("planCode")String planCode);
+    SyCostLossReview queryCostAllocationByCode(@Param("planCode")String planCode);
 }

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

@@ -59,6 +59,10 @@
                     where cSOCode like 'sy%' and CHARINDEX('-',cSOCode)>0
 
         ) as views
+        where 1=1
+        <if test="e.planNo !=null and e.planNo !=''">
+           and planNo like CONCAT(#{e.planNo},'%')
+        </if>
         group by planNo
 
     </select>
@@ -233,4 +237,20 @@
 
 
     </select>
+
+    <select id="querySyFabricLossByCode" resultType="org.jeecg.modules.documents.costLossReview.entity.SyCostLossReview">
+        select
+        submit_date as fsubmitDate,reject_date as frejectDate,first_approve_date as ffirstApproveDate,
+        final_approve_date as ffinalApproveDate,status as fstatus
+        from sy_fabric_loss_report
+        where plan_code=#{planCode}
+    </select>
+
+    <select id="queryCostAllocationByCode" resultType="org.jeecg.modules.documents.costLossReview.entity.SyCostLossReview">
+        select
+        submit_date as csubmitDate,reject_date as frejectDate,first_approve_date as ffirstApproveDate,
+        final_approve_date as cfinalApproveDate,status as cstatus
+        from sy_cost_json
+        where plan_num=#{planCode}
+    </select>
 </mapper>

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/costLossReview/service/ISyCostLossReviewService.java

@@ -20,4 +20,6 @@ public interface ISyCostLossReviewService extends IService<SyCostLossReview> {
      List<String> queryMakerByplanNo(String planNo);
      IPage<FabricLossReview> querySyFabricLossReport(FabricLossReview sy, Page<FabricLossReview> page);
      IPage<CostAllocationReview> queryCostAllocation(CostAllocationReview sy, Page<CostAllocationReview> page);
+     SyCostLossReview querySyFabricLossByCode(String planCode);
+     SyCostLossReview queryCostAllocationByCode(String planCode);
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/costLossReview/service/impl/SyCostLossReviewServiceImpl.java

@@ -45,4 +45,14 @@ public class SyCostLossReviewServiceImpl extends ServiceImpl<SyCostLossReviewMap
     public IPage<CostAllocationReview> queryCostAllocation(CostAllocationReview sy, Page<CostAllocationReview> page) {
         return syCostLossReviewMapper.queryCostAllocation(sy, page);
     }
+
+    @Override
+    public SyCostLossReview querySyFabricLossByCode(String planCode) {
+        return syCostLossReviewMapper.querySyFabricLossByCode(planCode);
+    }
+
+    @Override
+    public SyCostLossReview queryCostAllocationByCode(String planCode) {
+        return syCostLossReviewMapper.queryCostAllocationByCode(planCode);
+    }
 }