BUG处理

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

@@ -32,7 +32,7 @@ public interface QcsMdfFormDao extends BaseMapper<QcsMdfFormDo> {
     void upStatus(@Param("formId") String formId, @Param("deptId") String deptId);
 
     @Select("select d.ID,d.PROID,d.LOSSNO,d.MAINID,cc.SUBJECTNO as MODIFYREASON from qcs_loss_detail d left join qcs_main_cost c on d.MAINID=c.ID left join qcs_column_config cc on c.ID=cc.LOSSID\n" +
-            "where d.DELETED='0' and c.DELETED='0' and cc.DELETED='0' and c.BASEID=#{baseId} and DATE_FORMAT(c.YEARMONTH,'%Y-%m')=#{yearMonth} and cc.THRSUBJECT='设计变更损失'")
+            "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}")

qcs-common/src/main/java/com/rongwei/bscommon/sys/service/impl/CommonServiceImpl.java

@@ -12,6 +12,7 @@ import com.rongwei.bsentity.vo.QcsMdfFormVo;
 import com.rongwei.bsentity.vo.QcsMdfRowVo;
 import com.rongwei.bsentity.vo.QcsMdfSectionVo;
 import com.rongwei.rwcommon.base.R;
+import com.rongwei.rwcommon.utils.StringUtils;
 import com.rongwei.rwcommon.vo.CriteriaQuery;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -95,26 +96,26 @@ public class CommonServiceImpl implements CommonService {
                     qcsMdfFormVo.setCentersell("1");//集中派发默认是
                     qcsMdfFormDoList.add(qcsMdfFormVo);
                     for (QcsMdfSectionVo qcsMdfSectionVo : qcsMdfFormVo.getSections()) {
-                        if (qcsMdfSectionVo.getFormid() == null) {
+                        if (StringUtils.isBlank(qcsMdfSectionVo.getFormid())) {
                             qcsMdfSectionVo.setFormid(qcsMdfFormVo.getId());
                         }
                         qcsMdfSectionDoList.add(qcsMdfSectionVo);
                         for (QcsMdfRowVo qcsMdfRowVo : qcsMdfSectionVo.getRows()) {
-                            if (qcsMdfRowVo.getFormid() == null) {
+                            if (StringUtils.isBlank(qcsMdfRowVo.getFormid())) {
                                 qcsMdfRowVo.setFormid(qcsMdfFormVo.getId());
                             }
-                            if (qcsMdfRowVo.getSectionid() == null) {
+                            if (StringUtils.isBlank(qcsMdfRowVo.getSectionid())) {
                                 qcsMdfRowVo.setSectionid(qcsMdfSectionVo.getId());
                             }
                             qcsMdfRowDoList.add(qcsMdfRowVo);
                             for (QcsMdfFileDo qcsMdfFileDo : qcsMdfRowVo.getFiles()) {
-                                if (qcsMdfFileDo.getFormid() == null) {
+                                if (StringUtils.isBlank(qcsMdfFileDo.getFormid())) {
                                     qcsMdfFileDo.setFormid(qcsMdfFormVo.getId());
                                 }
-                                if (qcsMdfFileDo.getSectionid() == null) {
+                                if (StringUtils.isBlank(qcsMdfFileDo.getSectionid())) {
                                     qcsMdfFileDo.setSectionid(qcsMdfSectionVo.getId());
                                 }
-                                if (qcsMdfFileDo.getRowsid() == null) {
+                                if (StringUtils.isBlank(qcsMdfFileDo.getRowsid())) {
                                     qcsMdfFileDo.setRowsid(qcsMdfRowVo.getId());
                                 }
                                 qcsMdfFileDoList.add(qcsMdfFileDo);