fix 优化

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -305,6 +305,7 @@ public class SysUserController extends BaseController {
                 newUser.setDeptId(entInfo.getOwnerId());
                 newUser.setOrgId(entInfo.getOwnerId());
                 SysDept sysDept = deptService.selectDeptById(entInfo.getOwnerId());
+                String locationType = "2";
                 if (sysDept == null) {
                     sysDept = new SysDept();
                     sysDept.setDeptId(entInfo.getOwnerId());
@@ -335,12 +336,16 @@ public class SysUserController extends BaseController {
                         sysDept.setParentId("10011");
                     } else if ("水运工程".equals(entInfo.getOwnerCategory())) {
                         sysDept.setParentId("10012");
+                        locationType = "1";
                     } else if ("航运企业".equals(entInfo.getOwnerCategory())) {
                         sysDept.setParentId("10013");
+                        locationType = "1";
                     } else if ("港口码头".equals(entInfo.getOwnerCategory())) {
                         sysDept.setParentId("10014");
+                        locationType = "1";
                     } else if ("水上游览经营".equals(entInfo.getOwnerCategory())) {
                         sysDept.setParentId("10015");
+                        locationType = "1";
                     } else if ("货运场站".equals(entInfo.getOwnerCategory())) {
                         sysDept.setParentId("10016");
                     }
@@ -350,13 +355,17 @@ public class SysUserController extends BaseController {
                 if (resourcesList == null || resourcesList.size() == 0) {
                     // 新增应急仓库
                     ResourceBo resource = new ResourceBo();
+                    resource.setAdminOrgName(entInfo.getAdminOrgName());
                     resource.setResourceType(1);
                     resource.setName(entInfo.getEntName() + "仓库");
                     resource.setManageUnit(entInfo.getEntName());
                     resource.setContactName(data.getName());
                     resource.setContactPhone(data.getMobile());
-                    resource.setLocationType("2");
+                    resource.setLocationType(locationType);
                     resource.setManageUnitId(entInfo.getOwnerId());
+                    // 默认为宿迁市交通局坐标
+                    resource.setLatitude("33.961569");
+                    resource.setLongitude("118.260139");
                     resourceService.insertByBo(resource);
                 }
             }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhdd/IncidentController.java

@@ -107,6 +107,7 @@ public class IncidentController extends BaseController {
 
     @Value("${spring.profiles.active}")
     private String env;
+    public static final String NEW_LINE = "\r\n";
 
     /**
      * 查询事件基础列表
@@ -476,12 +477,12 @@ public class IncidentController extends BaseController {
             if (incidentTasks != null && incidentTasks.size() > 0) {
                 StringBuilder tasks = new StringBuilder();
                 for (int i = 0; i < incidentTasks.size(); i++) {
-                    tasks.append(i + 1).append("、").append(incidentTasks.get(i).getTaskName()).append("\r");
+                    tasks.append(i + 1).append("、").append(incidentTasks.get(i).getTaskName()).append(NEW_LINE);
                     // 查询指令对应的处置过程
                     List<IncidentProcess> processList = processCollect.get(incidentTasks.get(i).getId());
                     if (processList != null && processList.size() > 0) {
-                        String collect = processList.stream().map(IncidentProcess::getDes).collect(Collectors.joining("\r    "));
-                        tasks.append("    ").append(collect).append("\r    ");
+                        String collect = processList.stream().map(IncidentProcess::getDes).collect(Collectors.joining(NEW_LINE + "\t"));
+                        tasks.append("    ").append(collect).append(NEW_LINE).append("\t");
                     }
                 }
                 map.put("tasks", tasks.toString());

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhdd/ResourceDetailController.java

@@ -1,5 +1,10 @@
 package com.ruoyi.web.controller.zhdd;
 
+import cn.afterturn.easypoi.entity.vo.NormalExcelConstants;
+import cn.afterturn.easypoi.excel.entity.ExportParams;
+import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
+import cn.afterturn.easypoi.view.PoiBaseView;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.core.controller.BaseController;
@@ -9,15 +14,19 @@ import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.core.validate.QueryGroup;
 import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.zhdd.domain.Resource;
+import com.ruoyi.zhdd.domain.ResourceDetail;
 import com.ruoyi.zhdd.domain.bo.ResourceDetailBo;
+import com.ruoyi.zhdd.domain.vo.ResourceDetailExport;
 import com.ruoyi.zhdd.domain.vo.ResourceDetailVo;
 import com.ruoyi.zhdd.domain.vo.ResourceVo;
 import com.ruoyi.zhdd.service.IResourceDetailService;
+import com.ruoyi.zhdd.service.IResourceService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.ui.ModelMap;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -28,11 +37,15 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 应急资源明细Controller
@@ -48,6 +61,7 @@ import java.util.List;
 public class ResourceDetailController extends BaseController {
 
     private final IResourceDetailService iResourceDetailService;
+    private final IResourceService resourceService;
 
     /**
      * 查询应急资源明细列表
@@ -65,10 +79,36 @@ public class ResourceDetailController extends BaseController {
     @ApiOperation("导出应急资源明细列表")
 //    @PreAuthorize("@ss.hasPermi('zhdd:resourceDetail:export')")
     @Log(title = "应急资源明细", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public void export(@Validated ResourceDetailBo bo, HttpServletResponse response) {
-        List<ResourceDetailVo> list = iResourceDetailService.queryList(bo);
-        ExcelUtil.exportExcel(list, "应急资源明细", ResourceDetailVo.class, response);
+    @GetMapping("/export/{ids}")
+    public void export(@PathVariable String[] ids, HttpServletResponse response, HttpServletRequest request, ModelMap modelMap) {
+        List<ResourceDetailVo> list = iResourceDetailService.listVo(Wrappers.<ResourceDetail>lambdaQuery()
+            .in(ResourceDetail::getResourceId, Arrays.asList(ids)).orderByAsc(ResourceDetail::getResourceId));
+        // 查询仓库名称
+        List<Resource> list1 = resourceService.list(Wrappers.<Resource>lambdaQuery().in(Resource::getId, Arrays.asList(ids)));
+        Map<String, Resource> collect = list1.stream().collect(Collectors.toMap(Resource::getId, a -> a));
+
+        Map<String, List<ResourceDetailVo>> collect1 = list.stream().collect(Collectors.groupingBy(ResourceDetailVo::getResourceId));
+
+        List<ResourceDetailExport> exportList = new ArrayList<>();
+        for (Map.Entry<String, List<ResourceDetailVo>> stringListEntry : collect1.entrySet()) {
+            ResourceDetailExport bean = new ResourceDetailExport();
+            Resource resource = collect.get(stringListEntry.getKey());
+            bean.setAdminOrgName(resource.getAdminOrgName());
+            bean.setResourceName(resource.getName());
+            bean.setManageUnit(resource.getManageUnit());
+            bean.setContactName(resource.getContactName());
+            bean.setContactPhone(resource.getContactPhone());
+            bean.setAddress(resource.getAddress());
+            bean.setDetail(stringListEntry.getValue());
+            exportList.add(bean);
+        }
+        ExportParams params = new ExportParams("仓库物资明细", "仓库物资", ExcelType.XSSF);
+        params.setFreezeCol(5);
+        modelMap.put(NormalExcelConstants.DATA_LIST, exportList);
+        modelMap.put(NormalExcelConstants.CLASS, ResourceDetailExport.class);
+        modelMap.put(NormalExcelConstants.PARAMS, params);
+        modelMap.put(NormalExcelConstants.FILE_NAME, "仓库物资明细");
+        PoiBaseView.render(modelMap, request, response, NormalExcelConstants.EASYPOI_EXCEL_VIEW);
     }
 
     /**

ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java

@@ -30,6 +30,7 @@ public class TableDataInfo<T> implements Serializable {
 
     private long pageNum;
     private long pageSize;
+    private String currentUser;
 
     /**
      * 列表数据

ruoyi-common/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java

@@ -1,80 +1,68 @@
 package com.ruoyi.common.exception.file;
 
-import java.util.Arrays;
 import org.apache.commons.fileupload.FileUploadException;
 
+import java.util.Arrays;
+
 /**
  * 文件上传 误异常类
- * 
+ *
  * @author ruoyi
  */
-public class InvalidExtensionException extends FileUploadException
-{
+public class InvalidExtensionException extends FileUploadException {
     private static final long serialVersionUID = 1L;
 
     private String[] allowedExtension;
     private String extension;
     private String filename;
 
-    public InvalidExtensionException(String[] allowedExtension, String extension, String filename)
-    {
-        super("filename : [" + filename + "], extension : [" + extension + "], allowed extension : [" + Arrays.toString(allowedExtension) + "]");
+    public InvalidExtensionException(String[] allowedExtension, String extension, String filename) {
+        super("文件名 : [" + filename + "], 文件格式 : [" + extension + "], 允许的文件格式 : [" + Arrays.toString(allowedExtension) + "]");
         this.allowedExtension = allowedExtension;
         this.extension = extension;
         this.filename = filename;
     }
 
-    public String[] getAllowedExtension()
-    {
+    public String[] getAllowedExtension() {
         return allowedExtension;
     }
 
-    public String getExtension()
-    {
+    public String getExtension() {
         return extension;
     }
 
-    public String getFilename()
-    {
+    public String getFilename() {
         return filename;
     }
 
-    public static class InvalidImageExtensionException extends InvalidExtensionException
-    {
+    public static class InvalidImageExtensionException extends InvalidExtensionException {
         private static final long serialVersionUID = 1L;
 
-        public InvalidImageExtensionException(String[] allowedExtension, String extension, String filename)
-        {
+        public InvalidImageExtensionException(String[] allowedExtension, String extension, String filename) {
             super(allowedExtension, extension, filename);
         }
     }
 
-    public static class InvalidFlashExtensionException extends InvalidExtensionException
-    {
+    public static class InvalidFlashExtensionException extends InvalidExtensionException {
         private static final long serialVersionUID = 1L;
 
-        public InvalidFlashExtensionException(String[] allowedExtension, String extension, String filename)
-        {
+        public InvalidFlashExtensionException(String[] allowedExtension, String extension, String filename) {
             super(allowedExtension, extension, filename);
         }
     }
 
-    public static class InvalidMediaExtensionException extends InvalidExtensionException
-    {
+    public static class InvalidMediaExtensionException extends InvalidExtensionException {
         private static final long serialVersionUID = 1L;
 
-        public InvalidMediaExtensionException(String[] allowedExtension, String extension, String filename)
-        {
+        public InvalidMediaExtensionException(String[] allowedExtension, String extension, String filename) {
             super(allowedExtension, extension, filename);
         }
     }
 
-    public static class InvalidVideoExtensionException extends InvalidExtensionException
-    {
+    public static class InvalidVideoExtensionException extends InvalidExtensionException {
         private static final long serialVersionUID = 1L;
 
-        public InvalidVideoExtensionException(String[] allowedExtension, String extension, String filename)
-        {
+        public InvalidVideoExtensionException(String[] allowedExtension, String extension, String filename) {
             super(allowedExtension, extension, filename);
         }
     }

ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

@@ -120,7 +120,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
             .antMatchers("/system/**").permitAll()
             .antMatchers("/getInfo").permitAll()
             .antMatchers("/getRouters").permitAll()
-            .antMatchers("/common/upload", "/common/download/resource").permitAll()
+            .antMatchers("/common/upload", "/common/download/resource", "/zhdd/resourceDetail/export/**").permitAll()
 
             // 系统层面
             .antMatchers("/system/dept/treeselect",

ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/SecurityInterceptor.java

@@ -126,6 +126,7 @@ public class SecurityInterceptor implements HandlerInterceptor {
                         newUser.setDeptId(entInfo.getOwnerId());
                         newUser.setOrgId(entInfo.getOwnerId());
                         SysDept sysDept = deptService.selectDeptById(entInfo.getOwnerId());
+                        String locationType = "2";
                         if (sysDept == null) {
                             sysDept = new SysDept();
                             sysDept.setDeptId(entInfo.getOwnerId());
@@ -156,12 +157,16 @@ public class SecurityInterceptor implements HandlerInterceptor {
                                 sysDept.setParentId("10011");
                             } else if ("水运工程".equals(entInfo.getOwnerCategory())) {
                                 sysDept.setParentId("10012");
+                                locationType = "1";
                             } else if ("航运企业".equals(entInfo.getOwnerCategory())) {
                                 sysDept.setParentId("10013");
+                                locationType = "1";
                             } else if ("港口码头".equals(entInfo.getOwnerCategory())) {
                                 sysDept.setParentId("10014");
+                                locationType = "1";
                             } else if ("水上游览经营".equals(entInfo.getOwnerCategory())) {
                                 sysDept.setParentId("10015");
+                                locationType = "1";
                             } else if ("货运场站".equals(entInfo.getOwnerCategory())) {
                                 sysDept.setParentId("10016");
                             }
@@ -171,13 +176,17 @@ public class SecurityInterceptor implements HandlerInterceptor {
                         if (resourcesList == null || resourcesList.size() == 0) {
                             // 新增应急仓库
                             ResourceBo resource = new ResourceBo();
+                            resource.setAdminOrgName(entInfo.getAdminOrgName());
                             resource.setResourceType(1);
                             resource.setName(entInfo.getEntName() + "仓库");
                             resource.setManageUnit(entInfo.getEntName());
                             resource.setContactName(data.getName());
                             resource.setContactPhone(data.getMobile());
-                            resource.setLocationType("2");
+                            resource.setLocationType(locationType);
                             resource.setManageUnitId(entInfo.getOwnerId());
+                            // 默认为宿迁市交通局坐标
+                            resource.setLatitude("33.961569");
+                            resource.setLongitude("118.260139");
                             resourceService.insertByBo(resource);
                         }
                     }

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/GatewayUserDetail.java

@@ -25,7 +25,10 @@ public class GatewayUserDetail {
     public static class EntInfo {
         private String entName;
         private String ownerId;
+        // 企业分类
         private String ownerCategory;
+        // 所属行业管理单位
+        private String adminOrgName;
     }
 
 }

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/Resource.java

@@ -121,4 +121,6 @@ public class Resource implements Serializable {
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Date updateTime;
 
+    private String adminOrgName;
+
 }

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/bo/ResourceBo.java

@@ -149,4 +149,6 @@ public class ResourceBo extends BaseEntity {
 
     // 等于1的情况下，查询存在物资的仓库
     private String notNullFlag;
+
+    private String adminOrgName;
 }

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/vo/DutyReportVo.java

@@ -53,4 +53,6 @@ public class DutyReportVo {
     @Excel(name = "更新时间")
     private Date updateTime;
 
+    private Date createTime;
+
 }

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/vo/ResourceDetailExport.java

@@ -0,0 +1,54 @@
+package com.ruoyi.zhdd.domain.vo;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import cn.afterturn.easypoi.excel.annotation.ExcelCollection;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+
+/**
+ * 应急资源明细视图对象 b_resource_detail
+ *
+ * @author xintong
+ * @date 2021-10-27
+ */
+@Data
+@ApiModel("应急资源明细导出视图对象")
+public class ResourceDetailExport {
+
+    private static final long serialVersionUID = 1L;
+
+    @Excel(name = "行业主管部门 ", needMerge = true, width = 25)
+    private String adminOrgName;
+
+    /**
+     * 资源id
+     */
+    @ApiModelProperty("资源id")
+    private String resourceId;
+
+    @Excel(name = "管理单位", needMerge = true, width = 25)
+    private String manageUnit;
+
+    @Excel(name = "仓库名称", needMerge = true, width = 25)
+    private String resourceName;
+
+    @Excel(name = "联系人", needMerge = true)
+    private String contactName;
+
+    /**
+     * 联系电话
+     */
+    @Excel(name = "联系电话", needMerge = true, width = 13)
+    private String contactPhone;
+
+    @Excel(name = "地址", width = 15, needMerge = true)
+    private String address;
+
+    @ExcelCollection(name = "物资明细")
+    private List<ResourceDetailVo> detail;
+
+}

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/vo/ResourceDetailStatic.java

@@ -0,0 +1,15 @@
+package com.ruoyi.zhdd.domain.vo;
+
+import lombok.Data;
+
+/**
+ * @Description: TODO
+ * @Author: huangcheng
+ * @Date: 2022/5/30
+ * @Version V1.0
+ */
+@Data
+public class ResourceDetailStatic {
+    private String resourceId;
+    private Integer num;
+}

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/vo/ResourceDetailVo.java

@@ -29,38 +29,38 @@ public class ResourceDetailVo {
     /**
      * 资源id
      */
-    @Excel(name = "资源id")
     @ApiModelProperty("资源id")
     private String resourceId;
 
     /**
      * 名称
      */
-    @Excel(name = "名称")
+    @Excel(name = "物资名称", width = 20)
     @ApiModelProperty("名称")
     private String name;
 
     /**
      * 型号
      */
-    @Excel(name = "型号")
+    @Excel(name = "型号", width = 20)
     @ApiModelProperty("型号")
     private String model;
 
     /**
      * 规格
      */
-    @Excel(name = "规格")
+    @Excel(name = "规格", width = 20)
     @ApiModelProperty("规格")
     private String size;
 
     /**
      * 数量
      */
-    @Excel(name = "数量")
+    @Excel(name = "仓储数量", width = 20)
     @ApiModelProperty("数量")
     private BigDecimal num;
 
+    @Excel(name = "可用数量", width = 20)
     private BigDecimal availableNum;
 
     private String pic;
@@ -68,7 +68,7 @@ public class ResourceDetailVo {
     /**
      * 单位
      */
-    @Excel(name = "单位")
+    @Excel(name = "计量单位")
     @ApiModelProperty("单位")
     private String unit;
 

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/vo/ResourceVo.java

@@ -116,5 +116,5 @@ public class ResourceVo {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
 
-
+    private String adminOrgName;
 }

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/mapper/ResourceDetailMapper.java

@@ -5,6 +5,7 @@ import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
 import com.ruoyi.zhdd.domain.Resource;
 import com.ruoyi.zhdd.domain.ResourceDetail;
 import com.ruoyi.zhdd.domain.bo.ResourceDetailBo;
+import com.ruoyi.zhdd.domain.vo.ResourceDetailStatic;
 
 import java.util.List;
 
@@ -21,4 +22,6 @@ public interface ResourceDetailMapper extends BaseMapperPlus<ResourceDetail> {
     List<JSONObject> queryResourceAvailable(List<String> resourceId);
 
     List<Object> queryExistResourceId();
+
+    List<ResourceDetailStatic> queryResourceTotalNum();
 }

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/service/IResourceDetailService.java

@@ -5,6 +5,7 @@ import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.zhdd.domain.ResourceDetail;
 import com.ruoyi.zhdd.domain.bo.ResourceDetailBo;
+import com.ruoyi.zhdd.domain.vo.ResourceDetailStatic;
 import com.ruoyi.zhdd.domain.vo.ResourceDetailVo;
 import com.ruoyi.zhdd.domain.vo.ResourceVo;
 
@@ -65,4 +66,6 @@ public interface IResourceDetailService extends IServicePlus<ResourceDetail, Res
     List<JSONObject> queryResourceAvailable(String id);
 
     List<Object> queryExistResourceId();
+
+    List<ResourceDetailStatic> queryResourceTotalNum();
 }

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/service/impl/DutyReportServiceImpl.java

@@ -2,14 +2,18 @@ package com.ruoyi.zhdd.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.convert.Convert;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.http.HttpStatus;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
 import com.ruoyi.common.core.page.PagePlus;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.PageUtils;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.UserUtil;
 import com.ruoyi.zhdd.domain.DutyReport;
 import com.ruoyi.zhdd.domain.bo.DutyReportBo;
 import com.ruoyi.zhdd.domain.vo.DutyReportVo;
@@ -40,7 +44,16 @@ public class DutyReportServiceImpl extends ServicePlusImpl<DutyReportMapper, Dut
     @Override
     public TableDataInfo<DutyReportVo> queryPageList(DutyReportBo bo) {
         PagePlus<DutyReport, DutyReportVo> result = pageVo(PageUtils.buildPagePlus(), buildQueryWrapper(bo));
-        return PageUtils.buildDataInfo(result);
+        TableDataInfo<DutyReportVo> rspData = new TableDataInfo<>();
+        rspData.setCode(HttpStatus.HTTP_OK);
+        rspData.setMsg("查询成功");
+        rspData.setRows(result.getRecordsVo());
+        rspData.setTotal(result.getTotal());
+        rspData.setPageNum(result.getCurrent());
+        rspData.setPageSize(result.getSize());
+        LoginUser cacheLoginUser = UserUtil.getCacheLoginUser();
+        rspData.setCurrentUser(cacheLoginUser.getUsername());
+        return rspData;
     }
 
     @Override
@@ -73,8 +86,17 @@ public class DutyReportServiceImpl extends ServicePlusImpl<DutyReportMapper, Dut
     public Boolean updateByBo(DutyReportBo bo) {
         // 如果是已提交则不能修改
         DutyReportVo dutyReportVo = this.queryById(bo.getId());
-        if (dutyReportVo.getStatus() == 2) {
+        // 只能修改自己的
+        LoginUser cacheLoginUser = UserUtil.getCacheLoginUser();
+        if (!dutyReportVo.getCreateBy().equals(cacheLoginUser.getUsername())) {
+            throw new ServiceException("只能编辑自己的报告！");
+        }
+        /*if (dutyReportVo.getStatus() == 2) {
             throw new ServiceException("报告已提交不能修改");
+        }*/
+        long l = DateUtil.betweenDay(dutyReportVo.getCreateTime(), DateUtil.date(), false);
+        if (l > 7) {
+            throw new ServiceException("只能对7天内的报告做修改！");
         }
         DutyReport update = BeanUtil.toBean(bo, DutyReport.class);
         validEntityBeforeSave(update);

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/service/impl/IncidentServiceImpl.java

@@ -149,9 +149,8 @@ public class IncidentServiceImpl extends ServicePlusImpl<IncidentMapper, Inciden
     public Boolean updateByBo(IncidentBo bo) {
         bo.setCreateBy(null);
         bo.setCreateDept(null);
-        bo.setAssistDept(StrUtil.nullToEmpty(bo.getAssistDept()));
-        bo.setAssistTaskUser(StrUtil.nullToEmpty(bo.getAssistTaskUser()));
-//        bo.setAssistDeptUser(StrUtil.nullToEmpty(bo.getAssistDeptUser()));
+//        bo.setAssistDept(StrUtil.nullToEmpty(bo.getAssistDept()));
+//        bo.setAssistTaskUser(StrUtil.nullToEmpty(bo.getAssistTaskUser()));
         // 是否为状态变更
         boolean flag;
 

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/service/impl/ResourceDetailServiceImpl.java

@@ -17,6 +17,7 @@ import com.ruoyi.zhdd.domain.Resource;
 import com.ruoyi.zhdd.domain.ResourceDetail;
 import com.ruoyi.zhdd.domain.bo.ResourceDetailBo;
 import com.ruoyi.zhdd.domain.vo.IncidentVo;
+import com.ruoyi.zhdd.domain.vo.ResourceDetailStatic;
 import com.ruoyi.zhdd.domain.vo.ResourceDetailVo;
 import com.ruoyi.zhdd.domain.vo.ResourceVo;
 import com.ruoyi.zhdd.mapper.ResourceDetailMapper;
@@ -154,4 +155,9 @@ public class ResourceDetailServiceImpl extends ServicePlusImpl<ResourceDetailMap
     public List<Object> queryExistResourceId() {
         return baseMapper.queryExistResourceId();
     }
+
+    @Override
+    public List<ResourceDetailStatic> queryResourceTotalNum() {
+        return baseMapper.queryResourceTotalNum();
+    }
 }

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/service/impl/ResourceServiceImpl.java

@@ -17,6 +17,7 @@ import com.ruoyi.zhdd.domain.Resource;
 import com.ruoyi.zhdd.domain.ResourceDetail;
 import com.ruoyi.zhdd.domain.bo.ResourceBo;
 import com.ruoyi.zhdd.domain.bo.ResourceDetailBo;
+import com.ruoyi.zhdd.domain.vo.ResourceDetailStatic;
 import com.ruoyi.zhdd.domain.vo.ResourceVo;
 import com.ruoyi.zhdd.mapper.ResourceMapper;
 import com.ruoyi.zhdd.service.IResourceDetailService;
@@ -29,6 +30,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 应急资源Service业务层处理
@@ -70,6 +72,15 @@ public class ResourceServiceImpl extends ServicePlusImpl<ResourceMapper, Resourc
     @Override
     public TableDataInfo<ResourceVo> queryPageList(ResourceBo bo) {
         PagePlus<Resource, ResourceVo> result = pageVo(PageUtils.buildPagePlus(), buildQueryWrapper(bo));
+        // 查询物资数量
+        List<ResourceDetailStatic> resourceDetailStatics = resourceDetailService.queryResourceTotalNum();
+        Map<String, Integer> collect = resourceDetailStatics.stream().collect(Collectors.toMap(ResourceDetailStatic::getResourceId, ResourceDetailStatic::getNum));
+        for (ResourceVo resourceVo : result.getRecordsVo()) {
+            if (resourceVo.getResourceType() == 1) {
+                Integer integer = collect.get(resourceVo.getId());
+                resourceVo.setNum(integer == null ? 0 : integer);
+            }
+        }
         return PageUtils.buildDataInfo(result);
     }
 

ruoyi-zhdd/src/main/resources/mapper/zhdd/ResourceDetailMapper.xml

@@ -60,4 +60,12 @@
         group by resource_id
     </select>
 
+    <select id="queryResourceTotalNum" resultType="com.ruoyi.zhdd.domain.vo.ResourceDetailStatic">
+        select resource_id as resourceId, count(1) as num
+        from b_resource_detail
+        where del_flag = '0'
+        group by resource_id
+    </select>
+
+
 </mapper>