巡检问题修改

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/ScmVehiclePatrolinspection.java

@@ -71,5 +71,7 @@ public class ScmVehiclePatrolinspection extends BaseEntity {
     private String createOrgSid; // 创建组织
     @ApiModelProperty("使用组织")
     private String useOrgSid; // 使用组织
+    @ApiModelProperty("推送状态 0 未推送 1 已推送")
+    private int pushState;
 
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetDto.java

@@ -100,4 +100,6 @@ public class ScmVehiclePatrolinspectionsheetDto implements Dto {
     private String warehouseSid;
     @ApiModelProperty("存放地点")
     private String warehouse;
+    @ApiModelProperty("推送状态 0 未推送 1 已推送")
+    private int pushState;
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java

@@ -367,7 +367,7 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
         String inventoryName = dto.getInventoryName();
         String inventoryStateKey = dto.getInventoryStateKey();
         String remarks = dto.getRemarks();
-        if (StringUtils.isBlank(inventoryStateKey)){
+        if (StringUtils.isBlank(inventoryStateKey)) {
             return rb.setMsg("请选择盘库状态");
         }
         if ("002".equals(inventoryStateKey) && StringUtils.isBlank(remarks)) {
@@ -480,6 +480,7 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
             patrolinspectionsheetDto.setUserName(dto.getLoginName());
             patrolinspectionsheetDto.setLocation(dto.getAddressCode());
             patrolinspectionsheetDto.setAddress(dto.getAddress());
+            patrolinspectionsheetDto.setPushState(1);
             scmVehiclePatrolinspectionsheetService.savePatrolinspectionsheet(patrolinspectionsheetDto);
         }
         return rb.success().setMsg("保存成功");

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.xml

@@ -46,9 +46,9 @@
             resultType="com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth.VehPatrolinspectionmonthVo">
         SELECT count(*),
                (SELECT count(*) FROM scm_vehicle_patrolinspection svp WHERE svp.state = '1' and svp.mainSid = #{mainSid}) AS totalNumber,
-               (SELECT count(*) FROM scm_vehicle_patrolinspection svp WHERE svp.patrolInspectionStateKey = '001' and svp.mainSid = #{mainSid}) AS unHandledNumber,
+               (SELECT count(*) FROM scm_vehicle_patrolinspection svp WHERE svp.patrolInspectionStateKey = '001' and svp.pushState = 1 and svp.mainSid = #{mainSid}) AS unHandledNumber,
                (SELECT count(*) FROM scm_vehicle_patrolinspection svp WHERE svp.patrolInspectionStateKey = '002' and svp.mainSid = #{mainSid}) AS processedNumber,
-               (SELECT count(*) FROM scm_vehicle_patrolinspection svp WHERE svp.patrolInspectionStateKey = '000' and svp.mainSid = #{mainSid}) AS notHandledNumber,
+               (SELECT count(*) FROM scm_vehicle_patrolinspection svp WHERE svp.patrolInspectionStateKey = '000' and svp.isDelete = 0 and svp.mainSid = #{mainSid}) AS notHandledNumber,
                (SELECT count(*) FROM scm_vehicle_patrolinspection svp WHERE svp.patrolInspectionStateKey = '000' and svp.mainSid = #{mainSid}) AS surplusNumber,
                (SELECT count(*) FROM scm_vehicle_patrolinspection svp WHERE svp.patrolInspectionStateKey = '003' and svp.mainSid = #{mainSid}) AS normalNumber
         FROM scm_vehicle_patrolinspection svp

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionService.java

@@ -264,6 +264,7 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService<ScmVeh
             paramsQuery.setPatrolinspectionEndDate(s[1]);
         }
         QueryWrapper<AppScmVehiclePatrolinspectionPageVo> qw = new QueryWrapper<>();
+        qw.eq("svp.isDelete", 0);
         if (StringUtils.isNotBlank(pagerQuery.getParams().getUseOrgSid())) {
             qw.eq("svp.createOrgSid", pagerQuery.getParams().getUseOrgSid());
         }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetService.java

@@ -441,8 +441,10 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
         scmVehiclePatrolinspection.setPatrolInspectionState(oneValue);
         scmVehiclePatrolinspection.setPatrolInspectionStateKey(oneKey);
         scmVehiclePatrolinspection.setCreateOrgSid(useOrgSid);
+        scmVehiclePatrolinspection.setCreateBySid(dto.getUserSid());
         scmVehiclePatrolinspection.setUseOrgSid(useOrgSid);
         scmVehiclePatrolinspection.setState(0);
+        scmVehiclePatrolinspection.setPushState(dto.getPushState());
         scmVehiclePatrolinspectionService.save(scmVehiclePatrolinspection);
 
         BeanUtil.copyProperties(dto, scmVehiclePatrolinspectionsheet, "sid");

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthService.java

@@ -241,6 +241,7 @@ public class ScmVehPatrolinspectionmonthService extends MybatisBaseService<ScmVe
                 scmVehiclePatrolinspection.setCreateOrgSid(useOrgSid);
                 scmVehiclePatrolinspection.setCreateBySid(userSid);
                 scmVehiclePatrolinspection.setUseOrgSid(useOrgSid);
+                scmVehiclePatrolinspection.setPushState(0);
                 scmVehiclePatrolinspectionService.save(scmVehiclePatrolinspection);
             }
             if (mainList.size() > 0) {
@@ -258,6 +259,7 @@ public class ScmVehPatrolinspectionmonthService extends MybatisBaseService<ScmVe
                     scmVehiclePatrolinspection.setCreateOrgSid(useOrgSid);
                     scmVehiclePatrolinspection.setUseOrgSid(useOrgSid);
                     scmVehiclePatrolinspection.setCreateBySid(userSid);
+                    scmVehiclePatrolinspection.setPushState(0);
                     scmVehiclePatrolinspectionService.save(scmVehiclePatrolinspection);
                     ScmVehiclePatrolinspectionsheet scmVehiclePatrolinspectionsheet = new ScmVehiclePatrolinspectionsheet();
                     scmVehiclePatrolinspectionsheet.setDutyName(inspection.getLiableName());