Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys...

Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys into V20231129-中建一局二公司

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/CbProjectRecordServiceImpl.java

@@ -380,12 +380,11 @@ public class CbProjectRecordServiceImpl extends ServiceImpl<CbProjectRecordMappe
                     , "存在解析中的项目,删除失败");
 
             //各个成本类型数据和对应每月成本数据暂不做删除,项目台账列表查不出来自然也无法查看数据
-
             //删除项目文件记录
             flag = projectFileMapper.delete(new LambdaQueryWrapper<CbProjectFile>()
                     .eq(CbProjectFile::getProjectId, projectId));
             //删除项目记录
-            Assert.isTrue(flag > 0, "操作异常,请联系管理员");
+            Assert.isTrue(flag == 0, "操作异常,请联系管理员");
             flag = baseMapper.deleteById(projectId);
         }
         return flag;
@@ -414,6 +413,7 @@ public class CbProjectRecordServiceImpl extends ServiceImpl<CbProjectRecordMappe
         QueryWrapper<CbProjectRecord> wrapper = Wrappers.query();
         wrapper
                 .eq("project_file_status", CbProjectConstants.PROJECT_FILE_STATUS_PREPARING)
+                .ne("cb_stage", CbProjectConstants.CB_STAGE_NO_COST_PLAN)
                 .eq("del_flag", CbProjectConstants.DELETE_FLAG_EXIST)
                 .orderByDesc("update_time");
         return TableDataInfo.build(baseMapper.selectPageDraftDialogList(pageQuery.build(), wrapper));

dsk-module/dsk-biz-api/src/main/java/com/dsk/monitor/domain/vo/MonitorQueryMonitorCompanyPageVo.java

@@ -21,4 +21,8 @@ public class MonitorQueryMonitorCompanyPageVo extends BasePage {
      * 用户id
      */
     private Long userId = 7324L;
+    /**
+     * systemCode-来源区分
+     */
+    private String systemCode = "zjyj";
 }

dsk-module/dsk-biz-api/src/main/java/com/dsk/monitor/domain/vo/PushMonitorCompanyAddVo.java

@@ -23,4 +23,6 @@ public class PushMonitorCompanyAddVo {
      * 多个企业id数组
      */
     private List<Integer> cid;
+
+    private String systemCode = "zjyj";
 }

dsk-module/dsk-biz-api/src/main/java/com/dsk/monitor/domain/vo/PushMonitorCompanyCancelVo.java

@@ -22,4 +22,8 @@ public class PushMonitorCompanyCancelVo {
      * 多个企业id数组
      */
     private List<Integer> cid;
+    /**
+     * systemCode-来源区分
+     */
+    private String systemCode = "zjyj";
 }

dsk-module/dsk-biz-api/src/main/java/com/dsk/monitor/domain/vo/PushMonitorCompanyImportAddVo.java

@@ -22,4 +22,8 @@ public class PushMonitorCompanyImportAddVo {
      * 多个企业id数组
      */
     private List<String> names;
+    /**
+     * systemCode-来源区分
+     */
+    private String systemCode = "zjyj";
 }

dsk-module/dsk-biz-api/src/main/java/com/dsk/monitor/domain/vo/PushMonitorCompanyPageVo.java

@@ -21,4 +21,8 @@ public class PushMonitorCompanyPageVo extends BasePage {
      * 用户id
      */
     private Long userId  = 7324L;
+    /**
+     * systemCode-来源区分
+     */
+    private String systemCode = "zjyj";
 }

dsk-module/dsk-biz-api/src/main/java/com/dsk/monitor/domain/vo/PushMonitorDynamicPageVo.java

@@ -19,4 +19,8 @@ public class PushMonitorDynamicPageVo extends BasePage {
     private Long userId = 7324L;
 
     private ConditionVo condition;
+    /**
+     * systemCode-来源区分
+     */
+    private String systemCode = "zjyj";
 }

dsk-module/dsk-biz-api/src/main/java/com/dsk/monitor/domain/vo/PushMonitorReportPageVo.java

@@ -21,4 +21,8 @@ public class PushMonitorReportPageVo extends BasePage {
      * 用户id
      */
     private Long userId = 7324L;
+    /**
+     * systemCode-来源区分
+     */
+    private String systemCode = "zjyj";
 }

dsk-module/dsk-biz-api/src/main/java/com/dsk/monitor/domain/vo/PushSettingHolidayVo.java

@@ -17,4 +17,6 @@ public class PushSettingHolidayVo {
      */
     private Long timestamp;
 
+    private String systemCode = "ZJYJ";
+
 }

dsk-module/dsk-biz-api/src/main/resources/mapper/cscec/CbProjectRecordMapper.xml

@@ -34,6 +34,8 @@
         cpr.project_file_status != #{projectFileStatusPreparing}
         or
         cpr.cb_stage = #{cbStageNoCostPlan}
+        and
+        cpr.del_flag=#{deleteFlagExist}
         order by cpr.cb_stage desc) a
         group by a.related_id
         order by a.create_time desc