添加修改原因与责任单位逻辑

qcs-common/src/main/java/com/rongwei/bscommon/sys/dao/QcsMdfFormDao.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.rongwei.bsentity.domain.QcsLossDetailDo;
+import com.rongwei.bsentity.domain.QcsMdfDetailDo;
 import com.rongwei.bsentity.domain.QcsMdfFormDo;
 import com.rongwei.bsentity.domain.QcsMdfRowDo;
 import com.rongwei.rwadmincommon.system.domain.SysUserDo;
@@ -35,8 +36,8 @@ public interface QcsMdfFormDao extends BaseMapper<QcsMdfFormDo> {
             "where d.DELETED='0' and c.DELETED='0' and cc.DELETED='0' and c.COSTTYPE='3' and c.BASEID=#{baseId} and DATE_FORMAT(c.YEARMONTH,'%Y-%m')=#{yearMonth} and cc.THRSUBJECT='设计变更损失'")
     List<QcsLossDetailDo> getLossDetails(@Param("baseId") String baseId, @Param("yearMonth") String yearMonth);
 
-    @Select("select SUM(ACTAMOUNT) as ACTAMOUNTSUM from qcs_mdf_detail where DELETED='0' and FORMID=#{formId} and DEPTID=#{deptId}")
-    Map<String, Object> getDeptAmountSum(@Param("formId") String formId, @Param("deptId") String deptId);
+    @Select("select SUM(ACTAMOUNT) as ACTAMOUNTSUM from qcs_mdf_detail where DELETED='0' and FORMID=#{formId} and DUTYDEPTID=#{dutyDeptId}")
+    Map<String, Object> getDeptAmountSum(@Param("formId") String formId, @Param("dutyDeptId") String dutyDeptId);
 
     @Update("update qcs_loss_detail set ${subjectNo}=${subjectval},MODIFYDATE=NOW() where ID=#{lossId}")
     void upAmount(@Param("lossId") String lossId, @Param("subjectNo") String subjectNo, @Param("subjectval") String subjectval);
@@ -59,4 +60,10 @@ public interface QcsMdfFormDao extends BaseMapper<QcsMdfFormDo> {
             "from qcs_mdf_row r left join qcs_mdf_section s on r.SECTIONID=s.ID\n" +
             "where r.DELETED='0' and s.DELETED='0' and r.FORMID=#{formId} ${whr}")
     List<QcsMdfRowDo> getReportRows(@Param(value = "formId") String formId, @Param(value = "whr") String whr);
+
+    @Select("select REASON,DUTYDEPTID,DUTYDEPTNAME from qcs_type_res where DELETED='0' and LOSSTYPE='修改单' and IFNULL(DUTYDEPTID,'')!='' and IFNULL(DUTYDEPTNAME,'')!=''")
+    List<Map<String, String>> getResDuty();
+
+    @Select("select distinct DUTYDEPTID from qcs_mdf_detail where DELETED='0' and FORMID=#{formId}")
+    List<QcsMdfDetailDo> getDutyDeptIds(@Param(value = "formId") String formId);
 }

qcs-entity/src/main/java/com/rongwei/bsentity/domain/QcsMdfDetailDo.java

@@ -88,4 +88,19 @@ public class QcsMdfDetailDo extends BaseDo implements Serializable {
      * 提交时间
      */
     private Date submitdate;
+
+    /**
+     * 修改原因
+     */
+    private String mdfreason;
+
+    /**
+     * 责任单位ID
+     */
+    private String dutydeptid;
+
+    /**
+     * 责任单位
+     */
+    private String dutydeptname;
 }

qcs-entity/src/main/java/com/rongwei/bsentity/domain/QcsMdfRowDo.java

@@ -158,6 +158,11 @@ public class QcsMdfRowDo extends BaseDo {
      */
     @TableField("DEPTIDS")
     private String deptids;
+    /**
+     * 修改单附件
+     */
+    @TableField("ROWFILES")
+    private String rowfiles;
 
 
 }