瀏覽代碼

内外部导入优化

DLC 1 天之前
父節點
當前提交
442ae98175

+ 1 - 1
qcs-common/src/main/java/com/rongwei/bscommon/sys/dao/QcsMainCostDao.java

@@ -52,7 +52,7 @@ public interface QcsMainCostDao extends BaseDao<QcsMainCostDo> {
 
     @Select("select f.PROJECTDLPROJID,f.PROJECTID,f.PROJECTDLPROJNAME,f.SOURCENUMBERCODE,DATE_FORMAT(d.SUBMITDATE,'%Y-%m') as BASENAME,SUM(d.ACTAMOUNT) as ACTAMOUNT \n" +
             "from qcs_mdf_detail d left join qcs_mdf_form f on d.FORMID=f.ID\n" +
-            "where d.DELETED='0' and f.DELETED='0' and d.STATUS='已提交' and d.DEPTID=#{unitId}\n" +
+            "where d.DELETED='0' and f.DELETED='0' and d.STATUS='已提交' and d.DUTYDEPTID=#{unitId}\n" +
             "group by f.PROJECTDLPROJID,f.PROJECTID,f.PROJECTDLPROJNAME,f.SOURCENUMBERCODE,DATE_FORMAT(d.SUBMITDATE,'%Y-%m')")
     List<QcsMdfFormDo> getSubmitMdfDetal(@Param("unitId") String unitId);
 }

+ 1 - 1
qcs-common/src/main/java/com/rongwei/bscommon/sys/service/impl/QcsMainCostServiceImpl.java

@@ -611,7 +611,7 @@ public class QcsMainCostServiceImpl extends ServiceImpl<QcsMainCostDao, QcsMainC
         List<QcsSubjectConfigDo> qcsSubjectConfigDos = qcsMainCostDao.getSubjectConfig("and COSTTYPE='" + costType + "'");//科目配置
         List<QcsPartNoDo> allPartnos = slaveDao.getAllPartnos();//工号及图号信息
         List<Map<String, Object>> typeResMap = qcsMainCostDao.getTypeRess();
-        List<QcsMdfFormDo> qcsMdfFormDos = qcsMainCostDao.getSubmitMdfDetal(unitId);//获取该单位已提交的修改单数据
+        List<QcsMdfFormDo> qcsMdfFormDos = qcsMainCostDao.getSubmitMdfDetal(unitId);//获取该责任单位已提交的修改单数据
 
         Sheet sheet = new XSSFWorkbook(file.getInputStream()).getSheetAt(0);
         int lastRowNum = sheet.getLastRowNum();