盘库巡检问题修改

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java

@@ -2588,12 +2588,11 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData();
         pagerQuery.getParams().setUseOrgSid(useOrgSid);
         QueryWrapper<InspectionVinVo> qw = new QueryWrapper<>();
-        if (StringUtils.isNotBlank(pagerQuery.getParams().getName())) {
-            qw.like("bv.vinNo", pagerQuery.getParams().getName());
-        }
+        qw.like("bv.vinNo", pagerQuery.getParams().getName());
         qw.eq("bv.createOrgSid", pagerQuery.getParams().getUseOrgSid());
         qw.eq("bv.isDelete", 0);
-        qw.and(wrapper -> wrapper.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.DR_STOCK.getCode()));
+        qw.and(wrapper -> wrapper.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.RETURNING_STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.DCZ_STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.DR_STOCK.getCode()));
+//        qw.and(wrapper -> wrapper.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.DR_STOCK.getCode()));
         IPage<InspectionVinVo> iPage = baseMapper.getInspectionVinList(page, qw);
         for (InspectionVinVo record : iPage.getRecords()) {
             String addressSid = record.getAddressSid();

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

@@ -8,6 +8,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 @Data
 public class AppScmVehiclePatrolinspectionPageVo implements Vo {
 
+    private String id;
+
     @ApiModelProperty("记录sid")
     private String sid;
 

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/AppScmVehInventorymonthInfoVo.java

@@ -1,9 +1,13 @@
 package com.yxt.anrui.scm.api.scmvehinventorymonth;
 
+import com.yxt.anrui.scm.api.scmvehinventoryreport.RecipientListVo;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @Data
 public class AppScmVehInventorymonthInfoVo implements Vo {
     private static final long serialVersionUID = -8077170646957590520L;
@@ -30,6 +34,8 @@ public class AppScmVehInventorymonthInfoVo implements Vo {
     private String recipient;
     @ApiModelProperty("创建日期")
     private String date;
+    @ApiModelProperty("接收人集合")
+    private List<RecipientListVo> recipientList = new ArrayList<>();
 
 
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventorymonth/AppScmVehInventorymonthVo.java

@@ -50,7 +50,7 @@ public class AppScmVehInventorymonthVo implements Vo {
 
     private String sid; // sid
     @ApiModelProperty("生成报告状态")
-    private String state;
+    private int state;
     @ApiModelProperty("编号（yyyyMMdd）")
     private String reportId; // 编号（yyyyMMdd）
     @ApiModelProperty("创建时间")

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinventoryreport/RecipientListVo.java

@@ -0,0 +1,16 @@
+package com.yxt.anrui.scm.api.scmvehinventoryreport;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class RecipientListVo implements Vo {
+
+    private static final long serialVersionUID = -2236972592829923353L;
+    @ApiModelProperty("接收人sid")
+    private String sid; // 接收人sid
+    @ApiModelProperty("接收人姓名")
+    private String name; // 接收人姓名
+
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/AppLiableListVo.java

@@ -0,0 +1,15 @@
+package com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AppLiableListVo implements Vo {
+    private static final long serialVersionUID = -1049339684785700179L;
+
+    @ApiModelProperty("相关责任人名称")
+    private String liableName;
+    @ApiModelProperty("相关责任人sid")
+    private String liableSid;
+}

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehpatrolinspectionmonth/AppScmVehPatrolinspectionmonthInfoVo.java

@@ -4,6 +4,9 @@ import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @Data
 public class AppScmVehPatrolinspectionmonthInfoVo implements Vo {
     private static final long serialVersionUID = -5082102320532147476L;
@@ -23,4 +26,7 @@ public class AppScmVehPatrolinspectionmonthInfoVo implements Vo {
     @ApiModelProperty("创建日期")
     private String date;
 
+    @ApiModelProperty("接收人集合")
+    private List<AppLiableListVo> recipientList = new ArrayList<>();
+
 }

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

@@ -144,7 +144,7 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
             String createOrgSid = record.getCreateOrgSid();
             String id = record.getId();
             List<ScmVehicleStayInventoryVo> scmVehicleStayInventoryVos = baseMapper.selectInventory(vinNo, id, createOrgSid);
-            if (scmVehicleStayInventoryVos.size() > 0){
+            if (scmVehicleStayInventoryVos.size() > 0) {
                 ScmVehicleStayInventoryVo scmVehicleStayInventoryVo = scmVehicleStayInventoryVos.get(0);
                 record.setInventoryName(scmVehicleStayInventoryVo.getLastName());
                 record.setInventoryDate(scmVehicleStayInventoryVo.getLastDate());
@@ -370,10 +370,10 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
         if ("002".equals(inventoryStateKey) && StringUtils.isBlank(remarks)) {
             return rb.setMsg("备注请填写盘损原因");
         }
-        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
-        if (simpleDateFormat.format(new Date()).equals(dto.getLastData())) {
-            return rb.setMsg("今日已盘车辆，请勿重复提交");
-        }
+//        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+//        if (simpleDateFormat.format(new Date()).equals(dto.getLastData())) {
+//            return rb.setMsg("今日已盘车辆，请勿重复提交");
+//        }
         String sid = dto.getSid();
         if (StringUtils.isBlank(sid)) {
             BaseVehicleVo data = baseVehicleFeign.selVehicleByVinNo(dto.getVinNo()).getData();

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

@@ -101,4 +101,12 @@ public interface ScmVehiclePatrolinspectionMapper extends BaseMapper<ScmVehicleP
 
     @Select("update scm_vehicle_patrolinspection set isDelete = 1 where mainSid = #{sid} and patrolInspectionStateKey = '000' ")
     void updatePatrolInspectionState(@Param("sid") String sid);
+
+    @Select("select * from scm_vehicle_patrolinspection where isDelete = 0 and mainSid = #{sid} and vinNo = #{vin}")
+    List<AppScmVehiclePatrolinspectionPageVo> selectByMandSid(@Param("sid") String sid, @Param("vin") String vin);
+
+    @Update("update scm_vehicle_patrolinspection set isDelete = 1  where vinNo = #{vinNo} and id = #{id} ")
+    void deleteByVinNo(@Param("vinNo") String vinNo,@Param("id") String id);
+
+    List<AppScmVehiclePatrolinspectionPageVo> selectByVinNo(@Param("vinNo") String vinNo, @Param("useOrgSid") String useOrgSid);
 }

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

@@ -97,6 +97,21 @@
           and svp.patrolInspectionStateKey = #{stateKey}
     </select>
 
+    <select id="selectByVinNo"
+            resultType="com.yxt.anrui.scm.api.scmvehiclepatrolinspection.AppScmVehiclePatrolinspectionPageVo">
+        SELECT id,
+               sid,
+               vinNo as vin,
+               mainSid,
+               location as warehouse,
+               patrolInspectionState as `state`,
+               patrolInspectionStateKey as stateKey,
+               patrolInspectionDate as newInspectionDate,
+               patrolInspectionName as newInspectionName
+        FROM scm_vehicle_patrolinspection svp
+        WHERE vinNo = #{vinNo} AND createOrgSid = #{useOrgSid} ORDER BY id DESC
+    </select>
+
     <update id="updateByMainSid">
         update scm_vehicle_patrolinspection
         set patrolInspectionStateKey = #{stateKey},

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

@@ -328,4 +328,15 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService<ScmVeh
         return baseMapper.getMonthRemarksByMainSid(sid, stateKey);
     }
 
+    public List<AppScmVehiclePatrolinspectionPageVo> selectByMandSid(String sid,String vin) {
+        return baseMapper.selectByMandSid(sid,vin);
+    }
+
+    public void deleteByVinNo(String vinNo, String id) {
+        baseMapper.deleteByVinNo(vinNo,id);
+    }
+
+    public List<AppScmVehiclePatrolinspectionPageVo> selectByVinNo(String vinNo,String useOrgSid) {
+        return baseMapper.selectByVinNo(vinNo,useOrgSid);
+    }
 }

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

@@ -86,4 +86,10 @@ public interface ScmVehiclePatrolinspectionsheetMapper extends BaseMapper<ScmVeh
     AppScmVehiclePatroVo getInspectionInfo(String recordSid);
 
     AppScmVehiclePatrolinspectionsheetInfoVo fetchByMainSid(String mainSid);
+
+    @Update("update scm_vehicle_patrolinspection set isDelete = 1  where mainSid = #{mainSid} ")
+    void deleteByMainSid(@Param("mainSid") String mainSid);
+
+    @Select("SELECT count(*) FROM scm_vehicle_patrolinspectionsheet WHERE mainSid = #{mainSid}")
+    int selectByMainSidNum(@Param("mainSid") String mainSid);
 }

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

@@ -27,6 +27,7 @@ package com.yxt.anrui.scm.biz.scmvehiclepatrolinspectionsheet;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSONObject;
+import com.alibaba.nacos.api.config.filter.IFilterConfig;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
@@ -114,6 +115,8 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
     @Autowired
     ScmVehPatrolinspectionmonthService scmVehPatrolinspectionmonthService;
     @Autowired
+    ScmVehiclePatrolinspectionsheetService scmVehiclePatrolinspectionsheetService;
+    @Autowired
     SysStaffOrgFeign sysStaffOrgFeign;
     @Autowired
     SysUserFeign sysUserFeign;
@@ -279,6 +282,16 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
                 monthVoList = scmVehPatrolinspectionmonthService.selectListAll();
                 scmVehPatrolinspectionmonthVo = monthVoList.get(0);
             }
+            List<AppScmVehiclePatrolinspectionPageVo> list = scmVehiclePatrolinspectionService.selectByVinNo(dto.getVinNo(), useOrgSid);
+            if (list.size() > 0) {
+                String id = list.get(0).getId();
+                String mainSid = list.get(0).getSid();
+                scmVehiclePatrolinspectionService.deleteByVinNo(dto.getVinNo(), id);
+                int count = baseMapper.selectByMainSidNum(mainSid);
+                if (count > 0) {
+                    baseMapper.deleteByMainSid(mainSid);
+                }
+            }
             ScmVehiclePatrolinspection scmVehiclePatrolinspection = new ScmVehiclePatrolinspection();
             scmVehiclePatrolinspection.setVinNo(dto.getVinNo());
             scmVehiclePatrolinspection.setMainSid(scmVehPatrolinspectionmonthVo.getSid());
@@ -413,7 +426,16 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
             scmVehPatrolinspectionmonthVo = monthVoList.get(0);
 
         }
-
+        List<AppScmVehiclePatrolinspectionPageVo> list = scmVehiclePatrolinspectionService.selectByVinNo(dto.getVinNo(), useOrgSid);
+        if (list.size() > 0) {
+            String id = list.get(0).getId();
+            String mainSid = list.get(0).getSid();
+            scmVehiclePatrolinspectionService.deleteByVinNo(dto.getVinNo(), id);
+            int count = baseMapper.selectByMainSidNum(mainSid);
+            if (count > 0) {
+                baseMapper.deleteByMainSid(mainSid);
+            }
+        }
         ScmVehiclePatrolinspection scmVehiclePatrolinspection = new ScmVehiclePatrolinspection();
         scmVehiclePatrolinspection.setVinNo(dto.getVinNo());
         scmVehiclePatrolinspection.setMainSid(scmVehPatrolinspectionmonthVo.getSid());
@@ -435,8 +457,10 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
         scmVehiclePatrolinspectionsheet.setUseOrgSid(useOrgSid);
         scmVehiclePatrolinspectionsheet.setMainSid(scmVehiclePatrolinspection.getSid());
         BaseVehicleVo vehicleVo = baseVehicleFeign.selVehicleByVinNo(dto.getVinNo()).getData();
-        scmVehiclePatrolinspectionsheet.setModel(vehicleVo.getModelName());
-        scmVehiclePatrolinspectionsheet.setModelSid(vehicleVo.getModelSid());
+        if (vehicleVo != null) {
+            scmVehiclePatrolinspectionsheet.setModel(vehicleVo.getModelName());
+            scmVehiclePatrolinspectionsheet.setModelSid(vehicleVo.getModelSid());
+        }
         save(scmVehiclePatrolinspectionsheet);
 
         scmFileService.deleteByLinkSidAndType(scmVehiclePatrolinspectionsheet.getSid(), type1);

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventorymonth/ScmVehInventorymonthService.java

@@ -40,8 +40,12 @@ import com.yxt.anrui.scm.api.scmvehiclegression.AppScmVehicleGressionDto;
 import com.yxt.anrui.scm.api.scmvehicleinventory.AppScmVehicleCarInventoryListPageQuery;
 import com.yxt.anrui.scm.api.scmvehicleinventory.AppScmVehicleCarInventoryListPageVo;
 import com.yxt.anrui.scm.api.scmvehicleinventory.ScmVehicleInventory;
+import com.yxt.anrui.scm.api.scmvehicleinventory.ScmVehicleInventoryVo;
 import com.yxt.anrui.scm.api.scmvehinventorymonth.*;
+import com.yxt.anrui.scm.api.scmvehinventoryreport.RecipientListVo;
+import com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth.AppLiableListVo;
 import com.yxt.anrui.scm.biz.scmvehicleinventory.ScmVehicleInventoryService;
+import com.yxt.anrui.scm.biz.scmvehinventoryreport.ScmVehInventoryreportService;
 import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -58,9 +62,7 @@ import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 /**
  * Project: aaa(aaa) <br/>
@@ -86,6 +88,8 @@ public class ScmVehInventorymonthService extends MybatisBaseService<ScmVehInvent
     SysUserFeign sysUserFeign;
     @Autowired
     ScmVehicleInventoryService scmVehicleInventoryService;
+    @Autowired
+    ScmVehInventoryreportService scmVehInventoryreportService;
 
 
     private QueryWrapper<ScmVehInventorymonth> createQueryWrapper(ScmVehInventorymonthQuery query) {
@@ -263,7 +267,7 @@ public class ScmVehInventorymonthService extends MybatisBaseService<ScmVehInvent
             record.setDamageNumber(String.valueOf(vo.getDamageNumber()));
             record.setProfitNumber(String.valueOf(vo.getProfitNumber()));
             record.setActualNumber(String.valueOf(vo.getProfitNumber() + vo.getNormalNumber() + vo.getDamageNumber() + vo.getLossNumber()));
-            if (record.getState().equals(0)) {
+            if (record.getState() == 0) {
                 if (vo.getSurplusNumber() == 0) {
                     record.setShowBtn(true);
                 } else {
@@ -280,6 +284,21 @@ public class ScmVehInventorymonthService extends MybatisBaseService<ScmVehInvent
         ResultBean<AppScmVehInventorymonthInfoVo> rb = ResultBean.fireFail();
         AppScmVehInventorymonthInfoVo vo = new AppScmVehInventorymonthInfoVo();
         AppScmVehInventorymonthInfoVo appScmVehInventorymonthInfoVo = baseMapper.selByMainSid(sid);
+        List<RecipientListVo> recipientListVos = scmVehInventoryreportService.selectByMainSid();
+        if (recipientListVos.size() > 0) {
+            if (StringUtils.isNotBlank(recipientListVos.get(0).getName())) {
+                List<RecipientListVo> list = new ArrayList<>();
+                List<String> splitName = Arrays.asList(recipientListVos.get(0).getName().split(","));
+                List<String> splitSid = Arrays.asList(recipientListVos.get(0).getSid().split(","));
+                for (int i = 0; i < splitName.size(); i++) {
+                    RecipientListVo v = new RecipientListVo();
+                    v.setName(splitName.get(i));
+                    v.setSid(splitSid.get(i));
+                    list.add(v);
+                }
+                vo.setRecipientList(list);
+            }
+        }
         if (appScmVehInventorymonthInfoVo != null) {
             vo.setRecipient(appScmVehInventorymonthInfoVo.getRecipient());
             vo.setDate(appScmVehInventorymonthInfoVo.getDate());

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventoryreport/ScmVehInventoryreportMapper.java

@@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.scm.api.scmvehinventoryreport.RecipientListVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -53,13 +54,16 @@ import java.util.List;
 @Mapper
 public interface ScmVehInventoryreportMapper extends BaseMapper<ScmVehInventoryreport> {
 
-	//@Update("update scm_veh_inventoryreport set name=#{msg} where id=#{id}")
-	//IPage<ScmVehInventoryreportVo> voPage(IPage<ScmVehInventoryreport> page, @Param(Constants.WRAPPER) QueryWrapper<ScmVehInventoryreport> qw);
-	
-	IPage<ScmVehInventoryreportVo> selectPageVo(IPage<ScmVehInventoryreport> page, @Param(Constants.WRAPPER) Wrapper<ScmVehInventoryreport> qw);
-	
-	List<ScmVehInventoryreportVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<ScmVehInventoryreport> qw);
-	
-	@Select("select * from scm_veh_inventoryreport")
-	List<ScmVehInventoryreportVo> selectListVo();
+    //@Update("update scm_veh_inventoryreport set name=#{msg} where id=#{id}")
+    //IPage<ScmVehInventoryreportVo> voPage(IPage<ScmVehInventoryreport> page, @Param(Constants.WRAPPER) QueryWrapper<ScmVehInventoryreport> qw);
+
+    IPage<ScmVehInventoryreportVo> selectPageVo(IPage<ScmVehInventoryreport> page, @Param(Constants.WRAPPER) Wrapper<ScmVehInventoryreport> qw);
+
+    List<ScmVehInventoryreportVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<ScmVehInventoryreport> qw);
+
+    @Select("select * from scm_veh_inventoryreport")
+    List<ScmVehInventoryreportVo> selectListVo();
+
+    @Select("select receiverSids as sid, receiverNames as name  from scm_veh_inventoryreport order by id desc")
+    List<RecipientListVo> selectByMainSid();
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinventoryreport/ScmVehInventoryreportService.java

@@ -50,6 +50,7 @@ import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 
+import org.omg.CORBA.BAD_CONTEXT;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -239,4 +240,8 @@ public class ScmVehInventoryreportService extends MybatisBaseService<ScmVehInven
 //		JPushServer.sendPushAlias(messageDto.getMsgTitle(), messageDto.getMsgContent(), msgSid, messageDto.getMsgType(), "23","26","66"); // 别名
         System.out.println("process end");
     }
+
+    public List<RecipientListVo> selectByMainSid() {
+        return baseMapper.selectByMainSid();
+    }
 }

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

@@ -59,6 +59,7 @@ import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
@@ -301,6 +302,21 @@ public class ScmVehPatrolinspectionmonthService extends MybatisBaseService<ScmVe
             vo.setRecipient(appScmVehInventorymonthInfoVo.getRecipient());
             vo.setDate(appScmVehInventorymonthInfoVo.getDate());
         }
+        List<AppLiableListVo> appLiableListVos = scmVehPatrolinspectionreportService.selectByMainSid();
+        if (appLiableListVos.size() > 0) {
+            if (StringUtils.isNotBlank(appLiableListVos.get(0).getLiableName())) {
+                List<AppLiableListVo> list = new ArrayList<>();
+                List<String> splitName = Arrays.asList(appLiableListVos.get(0).getLiableName().split(","));
+                List<String> splitSid = Arrays.asList(appLiableListVos.get(0).getLiableSid().split(","));
+                for (int i = 0; i < splitName.size(); i++) {
+                    AppLiableListVo v = new AppLiableListVo();
+                    v.setLiableName(splitName.get(i));
+                    v.setLiableSid(splitSid.get(i));
+                    list.add(v);
+                }
+                vo.setRecipientList(list);
+            }
+        }
         VehPatrolinspectionmonthVo vehPatrolinspectionmonthVo = scmVehiclePatrolinspectionService.getMonthByMainSid(sid);
         vo.setActualNumber(String.valueOf(vehPatrolinspectionmonthVo.getNormalNumber() + vehPatrolinspectionmonthVo.getUnHandledNumber() + vehPatrolinspectionmonthVo.getProcessedNumber()));
         vo.setTotalNumber(String.valueOf(vehPatrolinspectionmonthVo.getTotalNumber()));

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreportMapper.java

@@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth.AppLiableListVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -53,13 +54,16 @@ import java.util.List;
 @Mapper
 public interface ScmVehPatrolinspectionreportMapper extends BaseMapper<ScmVehPatrolinspectionreport> {
 
-	//@Update("update scm_veh_patrolinspectionreport set name=#{msg} where id=#{id}")
-	//IPage<ScmVehPatrolinspectionreportVo> voPage(IPage<ScmVehPatrolinspectionreport> page, @Param(Constants.WRAPPER) QueryWrapper<ScmVehPatrolinspectionreport> qw);
-	
-	IPage<ScmVehPatrolinspectionreportVo> selectPageVo(IPage<ScmVehPatrolinspectionreport> page, @Param(Constants.WRAPPER) Wrapper<ScmVehPatrolinspectionreport> qw);
-	
-	List<ScmVehPatrolinspectionreportVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<ScmVehPatrolinspectionreport> qw);
-	
-	@Select("select * from scm_veh_patrolinspectionreport")
-	List<ScmVehPatrolinspectionreportVo> selectListVo();
+    //@Update("update scm_veh_patrolinspectionreport set name=#{msg} where id=#{id}")
+    //IPage<ScmVehPatrolinspectionreportVo> voPage(IPage<ScmVehPatrolinspectionreport> page, @Param(Constants.WRAPPER) QueryWrapper<ScmVehPatrolinspectionreport> qw);
+
+    IPage<ScmVehPatrolinspectionreportVo> selectPageVo(IPage<ScmVehPatrolinspectionreport> page, @Param(Constants.WRAPPER) Wrapper<ScmVehPatrolinspectionreport> qw);
+
+    List<ScmVehPatrolinspectionreportVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<ScmVehPatrolinspectionreport> qw);
+
+    @Select("select * from scm_veh_patrolinspectionreport")
+    List<ScmVehPatrolinspectionreportVo> selectListVo();
+
+    @Select("select receiverSids as liableSid, receiverNames as liableName  from scm_veh_patrolinspectionreport order by id desc")
+    List<AppLiableListVo> selectByMainSid();
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionreport/ScmVehPatrolinspectionreportService.java

@@ -36,6 +36,7 @@ import com.yxt.anrui.scm.api.scmvehiclepatrolinspectionsheet.AppPatrolinspection
 import com.yxt.anrui.scm.api.scmvehinventorymonth.AppVinAndRemarksVo;
 import com.yxt.anrui.scm.api.scmvehinventoryreport.AppReportDto;
 import com.yxt.anrui.scm.api.scmvehinventoryreport.RecipientListDto;
+import com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth.AppLiableListVo;
 import com.yxt.anrui.scm.biz.scmvehiclepatrolinspection.ScmVehiclePatrolinspectionService;
 import com.yxt.anrui.scm.biz.scmvehiclepatrolinspectionsheet.ScmVehiclePatrolinspectionsheetService;
 import com.yxt.anrui.scm.biz.scmvehinventorymonth.ScmVehInventorymonthService;
@@ -171,6 +172,15 @@ public class ScmVehPatrolinspectionreportService extends MybatisBaseService<ScmV
             question.append("（问题已解决）");
             question.append("\n");
         }
+        List<AppLiableListDto> liableList = dto.getList();
+        String DutyName = "";
+        String DutySid = "";
+        for (AppLiableListDto appLiableListDto : liableList) {
+            DutyName = appLiableListDto.getLiableName() + "," + DutyName;
+            DutySid = appLiableListDto.getLiableSid() + "," + DutySid;
+        }
+        scmVehPatrolinspectionreport.setReceiverNames(DutyName.substring(0, DutyName.length() - 1));
+        scmVehPatrolinspectionreport.setReceiverSids(DutySid.substring(0, DutySid.length() - 1));
         save(scmVehPatrolinspectionreport);
         scmVehiclePatrolinspectionService.updateState(dto.getMainSid());
         scmVehPatrolinspectionmonthService.updateBySidState(dto.getMainSid());
@@ -188,4 +198,8 @@ public class ScmVehPatrolinspectionreportService extends MybatisBaseService<ScmV
         scmVehiclePatrolinspectionsheetService.sendMessage(appPatrolinspectionDto);
         return rb.success();
     }
+
+    public List<AppLiableListVo> selectByMainSid() {
+        return baseMapper.selectByMainSid();
+    }
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inspection/VehPatrolinspectionmonthInfoVo.java

@@ -4,6 +4,8 @@ import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class VehPatrolinspectionmonthInfoVo implements Vo {
     private static final long serialVersionUID = 7694954957647668016L;
@@ -16,4 +18,10 @@ public class VehPatrolinspectionmonthInfoVo implements Vo {
 
     @ApiModelProperty("存在的问题")
     private String question;
+
+    @ApiModelProperty("创建日期")
+    private String date;
+
+    @ApiModelProperty("接收人集合")
+    private List<LiableListVo> recipientList;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/ReportListVo.java

@@ -0,0 +1,13 @@
+package com.yxt.anrui.terminal.api.supplychain.inventory;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+@Data
+public class ReportListVo implements Vo {
+    private static final long serialVersionUID = 7297399311087477036L;
+
+    private String name;
+
+    private String sid;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/VehInventorymonthInfoVo.java

@@ -4,6 +4,9 @@ import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @Data
 public class VehInventorymonthInfoVo implements Vo {
     private static final long serialVersionUID = 8050057958864145264L;
@@ -30,4 +33,7 @@ public class VehInventorymonthInfoVo implements Vo {
     private String recipient;
     @ApiModelProperty("创建日期")
     private String date;
+    @ApiModelProperty("接收人集合")
+    private List<ReportListVo> recipientList;
+
 }