数采仪列表 事后审核控制

src/main/java/com/cn/esermis/controller/PostMarkingController.java

@@ -4,13 +4,25 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.cn.esermis.dpld.entity.PostMarking;
+import com.cn.esermis.dpld.mapper.DataAcquisitionInstrumentMapper;
 import com.cn.esermis.dpld.model.PostMarkingVo;
+import com.cn.esermis.dpld.service.IDataAcquisitionInstrumentService;
 import com.cn.esermis.dpld.service.IPostMarkingService;
+import com.cn.esermis.model.BaseUser;
+import com.cn.esermis.utils.TokenUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import static com.cn.esermis.dpld.model.AjaxResult.error;
 import static com.cn.esermis.dpld.model.AjaxResult.success;
+import static com.cn.esermis.utils.TokenUtils.extractToken;
 
 /**
  * 事后标记
@@ -21,17 +33,63 @@ public class PostMarkingController
 {
     @Resource
     private IPostMarkingService postMarkingService;
-
+    @Resource
+    private IDataAcquisitionInstrumentService dataAcquisitionInstrumentService;
+    @Resource
+    private DataAcquisitionInstrumentMapper dataAcquisitionInstrumentMapper;
     /**
      * 分页查询列表
      * @param vo
      * @return
      */
     @GetMapping("/list")
-    public Object list(PostMarkingVo vo)
+    public Object list(PostMarkingVo vo, HttpServletRequest request)
     {
         IPage<PostMarking> page = new Page<>(vo.getPageNum(), vo.getPageSize());
-        return success(postMarkingService.page(page,new QueryWrapper<>()));
+        BaseUser userInfo = TokenUtils.getUserInfo(extractToken(request));
+        QueryWrapper<PostMarking> objectQueryWrapper = new QueryWrapper<>();
+        String verifyCompany = dataAcquisitionInstrumentMapper.verifyCompany(userInfo.getCompanyId());
+//        if (vo.getCompanyName() != null) {
+            String companyId = userInfo.getCompanyId();
+            if (verifyCompany != null && verifyCompany.length() < 5) {
+                List<String> companyCodes = dataAcquisitionInstrumentService.getComponyListAll(vo.getCompanyName());
+                if (!companyCodes.isEmpty()) {
+                    objectQueryWrapper.in("company_code", companyCodes);
+                }
+            }else{
+                List<String> companyCodes = dataAcquisitionInstrumentService.getComponyList(vo.getCompanyName(), companyId);
+                if (!companyCodes.isEmpty()) {
+                    objectQueryWrapper.in("company_code", companyCodes);
+                }
+            }
+//        }
+        IPage<PostMarking> rpage = postMarkingService.page(page, new QueryWrapper<>());
+        IPage<PostMarkingVo> voIPage = new Page<>();
+        List<PostMarking> records = rpage.getRecords();
+        List<PostMarkingVo> recordsvo = new ArrayList<>();
+        // 查询企业
+        Map<String, Object> componyMap = dataAcquisitionInstrumentService.getComponyMap();
+        // 查询工厂
+        Map<String, Object> departmentMap = dataAcquisitionInstrumentService.getDepartmentMap();
+        records.forEach(x->{
+            PostMarkingVo postMarkingVo = new PostMarkingVo();
+            BeanUtils.copyProperties(x, postMarkingVo);
+            if (postMarkingVo.getCompanyCode() != null && componyMap.get(postMarkingVo.getCompanyCode()) != null) {
+                Map componyMapobj = (Map) componyMap.get(postMarkingVo.getCompanyCode());
+                postMarkingVo.setCompanyName(componyMapobj.get("companylongname").toString());
+            }
+            if (postMarkingVo.getDepartmentCode() != null && departmentMap.get(postMarkingVo.getDepartmentCode()) != null) {
+                Map componyMapobj = (Map) departmentMap.get(postMarkingVo.getDepartmentCode());
+                postMarkingVo.setDepartmentName(componyMapobj.get("departmentname").toString());
+            }
+            recordsvo.add(postMarkingVo);
+        });
+        voIPage.setRecords(recordsvo);
+        voIPage.setCurrent(rpage.getCurrent());
+        voIPage.setSize(rpage.getSize());
+        voIPage.setTotal(rpage.getTotal());
+        voIPage.setPages(rpage.getPages());
+        return success(voIPage);
     }
 
     /**
@@ -67,6 +125,13 @@ public class PostMarkingController
     @PostMapping("/edit")
     public Object edit(@RequestBody PostMarking postMarking)
     {
+        // 审核流程控制
+        if (postMarking.getVerificationStatus() !=null && postMarking.getReasonClassification()!=null){
+            postMarking.setUnitType(1);
+        }
+        if (postMarking.getUnitType() == 3){
+            return error("请填写驳回原因。");
+        }
         postMarkingService.updateById(postMarking);
         return success();
     }

src/main/java/com/cn/esermis/dpld/entity/PostMarking.java

@@ -79,5 +79,9 @@ public class PostMarking {
     private String companyCode;
     @TableField(value = "department_code")
     private String departmentCode;
+    @TableField(value = "unit_type")
+    private Integer unitType;
+    @TableField(value = "unit_opinion")
+    private String unitOpinion;
 
 }

src/main/java/com/cn/esermis/dpld/model/PostMarkingVo.java

@@ -1,5 +1,6 @@
 package com.cn.esermis.dpld.model;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.cn.esermis.dpld.entity.PostMarking;
 import lombok.Data;
 
@@ -15,4 +16,14 @@ public class PostMarkingVo extends PostMarking {
      */
     private Integer pageSize;
 
+    /**
+     * 公司名称
+     */
+    private String companyName;
+
+    /**
+     * 工厂名称
+     */
+    private String departmentName;
+
 }