Merge branch 'dev-2.14.0' of province-qinghai/province-all into dev

unis-plugin/unis-plugin-biz/src/main/java/com/unis/circulateMonitor/modular/easeEnterprise/controller/EaseEnterpriseController.java

@@ -36,6 +36,8 @@ import com.unis.circulateMonitor.modular.easeEnterprise.service.EaseEnterpriseSe
 import javax.annotation.Resource;
 import javax.validation.Valid;
 import javax.validation.constraints.NotEmpty;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 放心粮油企业管理控制器
@@ -48,7 +50,6 @@ import javax.validation.constraints.NotEmpty;
 @RestController
 @Validated
 public class EaseEnterpriseController {
-
     @Resource
     private EaseEnterpriseService easeEnterpriseService;
 
@@ -60,7 +61,7 @@ public class EaseEnterpriseController {
      */
     @ApiOperationSupport(order = 1)
     @ApiOperation("获取放心粮油企业管理分页")
-    @SaCheckPermission("/circulateMonitor/easeEnterprise/page")
+//    @SaCheckPermission("/circulateMonitor/easeEnterprise/page")
     @GetMapping("/circulateMonitor/easeEnterprise/page")
     public CommonResult<Page<EaseEnterprise>> page(EaseEnterprisePageParam easeEnterprisePageParam) {
         return CommonResult.data(easeEnterpriseService.page(easeEnterprisePageParam));
@@ -75,7 +76,7 @@ public class EaseEnterpriseController {
     @ApiOperationSupport(order = 2)
     @ApiOperation("添加放心粮油企业管理")
     @CommonLog("添加放心粮油企业管理")
-    @SaCheckPermission("/circulateMonitor/easeEnterprise/add")
+//    @SaCheckPermission("/circulateMonitor/easeEnterprise/add")
     @PostMapping("/circulateMonitor/easeEnterprise/add")
     public CommonResult<String> add(@RequestBody @Valid EaseEnterpriseAddParam easeEnterpriseAddParam) {
         easeEnterpriseService.add(easeEnterpriseAddParam);
@@ -91,7 +92,7 @@ public class EaseEnterpriseController {
     @ApiOperationSupport(order = 3)
     @ApiOperation("编辑放心粮油企业管理")
     @CommonLog("编辑放心粮油企业管理")
-    @SaCheckPermission("/circulateMonitor/easeEnterprise/edit")
+//    @SaCheckPermission("/circulateMonitor/easeEnterprise/edit")
     @PostMapping("/circulateMonitor/easeEnterprise/edit")
     public CommonResult<String> edit(@RequestBody @Valid EaseEnterpriseEditParam easeEnterpriseEditParam) {
         easeEnterpriseService.edit(easeEnterpriseEditParam);
@@ -107,7 +108,7 @@ public class EaseEnterpriseController {
     @ApiOperationSupport(order = 4)
     @ApiOperation("删除放心粮油企业管理")
     @CommonLog("删除放心粮油企业管理")
-    @SaCheckPermission("/circulateMonitor/easeEnterprise/delete")
+//    @SaCheckPermission("/circulateMonitor/easeEnterprise/delete")
     @PostMapping("/circulateMonitor/easeEnterprise/delete")
     public CommonResult<String> delete(@RequestBody @Valid @NotEmpty(message = "集合不能为空")
                                                    CommonValidList<EaseEnterpriseIdParam> easeEnterpriseIdParamList) {
@@ -123,9 +124,23 @@ public class EaseEnterpriseController {
      */
     @ApiOperationSupport(order = 5)
     @ApiOperation("获取放心粮油企业管理详情")
-    @SaCheckPermission("/circulateMonitor/easeEnterprise/detail")
+//    @SaCheckPermission("/circulateMonitor/easeEnterprise/detail")
     @GetMapping("/circulateMonitor/easeEnterprise/detail")
     public CommonResult<EaseEnterprise> detail(@Valid EaseEnterpriseIdParam easeEnterpriseIdParam) {
         return CommonResult.data(easeEnterpriseService.detail(easeEnterpriseIdParam));
     }
+
+    @ApiOperationSupport(order = 6)
+    @ApiOperation("企业名称下拉")
+    @GetMapping("/circulateMonitor/easeEnterprise/getEnterpriseList")
+    public CommonResult<List<Map<String, Object>>> getEnterpriseList() {
+        return CommonResult.data(easeEnterpriseService.getEnterpriseList());
+    }
+
+    @ApiOperationSupport(order = 7)
+    @ApiOperation("汇总查询及分析列表-统计")
+    @GetMapping("/circulateMonitor/easeEnterprise/getCountNumber")
+    public CommonResult<Map<String, Object>> getCountNumber() {
+        return CommonResult.data(easeEnterpriseService.getCountNumber());
+    }
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/circulateMonitor/modular/easeEnterprise/entity/EaseEnterprise.java

@@ -118,4 +118,20 @@ public class EaseEnterprise {
     /** 状态 0：保存状态；1：提交（申请中）；2：驳回；3：审核通过； */
     @ApiModelProperty(value = "状态 0：保存状态；1：提交（申请中）；2：驳回；3：审核通过；", position = 21)
     private Integer status;
+
+    @ApiModelProperty(value = "是否配送中心名称0：否；1：是；", position = 22)
+    @TableField(exist = false)
+    private String isDistributionCenterName;
+
+    @ApiModelProperty(value = "是否经营店名称 0：否；1：是；", position = 23)
+    @TableField(exist = false)
+    private String isOperativeStoreName;
+
+    @ApiModelProperty(value = "审批人", position = 24)
+    @TableField(exist = false)
+    private String auditUserName;
+
+    @ApiModelProperty(value = "审批时间", position = 25)
+    @TableField(exist = false)
+    private String auditTime;
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/circulateMonitor/modular/easeEnterprise/mapper/EaseEnterpriseMapper.java

@@ -12,14 +12,26 @@
  */
 package com.unis.circulateMonitor.modular.easeEnterprise.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.unis.circulateMonitor.modular.easeEnterprise.entity.EaseEnterprise;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * 放心粮油企业管理Mapper接口
  *
  * @author QSHan
- * @date  2024/06/18 10:06
+ * @date 2024/06/18 10:06
  **/
 public interface EaseEnterpriseMapper extends BaseMapper<EaseEnterprise> {
+    Page<EaseEnterprise> pageList(Page<Object> objectPage, @Param("ew") QueryWrapper<EaseEnterprise> queryWrapper);
+
+    List<Map<String,Object>> getEnterpriseList();
+
+    // totalCount:基础信息数量,requestCount:放心粮油申请数量,auditCount:放心粮油已审批数量
+    Map<String,Object> getCountNumber();
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/circulateMonitor/modular/easeEnterprise/mapper/mapping/EaseEnterpriseMapper.xml

@@ -1,5 +1,50 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.unis.circulateMonitor.modular.easeEnterprise.mapper.EaseEnterpriseMapper">
-
+    <select id="pageList" parameterType="com.baomidou.mybatisplus.core.conditions.Wrapper" resultType="com.unis.circulateMonitor.modular.easeEnterprise.entity.EaseEnterprise">
+        SELECT
+            gee.*, CASE gee.is_distribution_center
+        WHEN 0 THEN
+            '否'
+        WHEN 1 THEN
+            '是'
+        ELSE
+            ''
+        END isDistributionCenterName,
+         CASE gee.is_operative_store
+        WHEN 0 THEN
+            '否'
+        WHEN 1 THEN
+            '是'
+        ELSE
+            ''
+        END isOperativeStoreName,
+         bar.audit_user_id auditUserId,
+         su.`NAME` auditUserName,
+         bar.audit_time auditTime
+        FROM
+            biz_cm_go_ease_enterprise gee
+        LEFT JOIN dev_dict dd ON gee.enterprise_province = dd.ID
+        LEFT JOIN dev_dict dd1 ON gee.enterprise_city = dd1.ID
+        LEFT JOIN dev_dict dd2 ON gee.enterprise_area = dd2.ID
+        LEFT JOIN biz_audit_request bar ON gee.id = bar.request_id
+        LEFT JOIN sys_user su ON su.ID = bar.audit_user_id
+        ${ew.customSqlSegment}
+    </select>
+    <select id="getEnterpriseList" resultType="map">
+        SELECT
+            id,
+            enterprise_name enterpriseName
+        FROM
+            biz_cm_go_ease_enterprise
+    </select>
+    <!-- totalCount:基础信息数量,requestCount:放心粮油申请数量,auditCount:放心粮油已审批数量 -->
+    <select id="getCountNumber" resultType="map">
+        SELECT
+            COUNT(1) totalCount,
+            SUM(CASE WHEN `status`=1 THEN 1 ELSE 0 END) requestCount,
+          SUM(CASE WHEN `status`=3 OR `status`=2 THEN 1 ELSE 0 END) auditCount
+        FROM
+            biz_cm_go_ease_enterprise
+    </select>
 </mapper>

unis-plugin/unis-plugin-biz/src/main/java/com/unis/circulateMonitor/modular/easeEnterprise/param/EaseEnterprisePageParam.java

@@ -48,4 +48,10 @@ public class EaseEnterprisePageParam {
     @ApiModelProperty(value = "关键词")
     private String searchKey;
 
+    @ApiModelProperty(value = "企业名称")
+    private String enterpriseName;
+
+    @ApiModelProperty(value = "行政区划")
+    private String administrativeArea;
+
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/circulateMonitor/modular/easeEnterprise/service/EaseEnterpriseService.java

@@ -21,6 +21,7 @@ import com.unis.circulateMonitor.modular.easeEnterprise.param.EaseEnterpriseIdPa
 import com.unis.circulateMonitor.modular.easeEnterprise.param.EaseEnterprisePageParam;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 放心粮油企业管理Service接口
@@ -77,4 +78,9 @@ public interface EaseEnterpriseService extends IService<EaseEnterprise> {
      * @date  2024/06/18 10:06
      **/
     EaseEnterprise queryEntity(String id);
+
+    List<Map<String, Object>> getEnterpriseList();
+
+    Map<String, Object> getCountNumber();
+
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/circulateMonitor/modular/easeEnterprise/service/impl/EaseEnterpriseServiceImpl.java

@@ -19,6 +19,12 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.unis.circulateMonitor.modular.goodEnterprise.entity.GoodEnterprise;
+import com.unis.policy.info.modular.auditRecord.entity.AuditRecord;
+import com.unis.policy.info.modular.auditRecord.mapper.AuditRecordMapper;
+import com.unis.policy.info.modular.auditRequest.entity.AuditRequest;
+import com.unis.policy.info.modular.auditRequest.mapper.AuditRequestMapper;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import com.unis.common.enums.CommonSortOrderEnum;
@@ -32,7 +38,9 @@ import com.unis.circulateMonitor.modular.easeEnterprise.param.EaseEnterpriseIdPa
 import com.unis.circulateMonitor.modular.easeEnterprise.param.EaseEnterprisePageParam;
 import com.unis.circulateMonitor.modular.easeEnterprise.service.EaseEnterpriseService;
 
+import javax.annotation.Resource;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 放心粮油企业管理Service接口实现类
@@ -42,6 +50,12 @@ import java.util.List;
  **/
 @Service
 public class EaseEnterpriseServiceImpl extends ServiceImpl<EaseEnterpriseMapper, EaseEnterprise> implements EaseEnterpriseService {
+    @Resource
+    private EaseEnterpriseMapper easeEnterpriseMapper;
+    @Resource
+    private AuditRecordMapper auditRecordMapper;
+    @Resource
+    private AuditRequestMapper auditRequestMapper;
 
     @Override
     public Page<EaseEnterprise> page(EaseEnterprisePageParam easeEnterprisePageParam) {
@@ -51,9 +65,19 @@ public class EaseEnterpriseServiceImpl extends ServiceImpl<EaseEnterpriseMapper,
             queryWrapper.orderBy(true, easeEnterprisePageParam.getSortOrder().equals(CommonSortOrderEnum.ASC.getValue()),
                     StrUtil.toUnderlineCase(easeEnterprisePageParam.getSortField()));
         } else {
-            queryWrapper.lambda().orderByAsc(EaseEnterprise::getId);
+            queryWrapper.lambda().orderByDesc(EaseEnterprise::getId);
         }
-        return this.page(CommonPageRequest.defaultPage(), queryWrapper);
+        // 搜索条件
+        if (StringUtils.isNotEmpty(easeEnterprisePageParam.getEnterpriseName())) {
+            queryWrapper.like("gee.enterprise_name", easeEnterprisePageParam.getEnterpriseName());
+        }
+        if (StringUtils.isNotEmpty(easeEnterprisePageParam.getAdministrativeArea())) {
+            queryWrapper.like("dd.DICT_LABEL", easeEnterprisePageParam.getAdministrativeArea())
+                    .or().like("dd1.DICT_LABEL", easeEnterprisePageParam.getAdministrativeArea())
+                    .or().like("dd2.DICT_LABEL", easeEnterprisePageParam.getAdministrativeArea())
+                    .or().like("gee.enterprise_address", easeEnterprisePageParam.getAdministrativeArea());
+        }
+        return easeEnterpriseMapper.pageList(CommonPageRequest.defaultPage(), queryWrapper);
     }
 
     @Transactional(rollbackFor = Exception.class)
@@ -61,6 +85,8 @@ public class EaseEnterpriseServiceImpl extends ServiceImpl<EaseEnterpriseMapper,
     public void add(EaseEnterpriseAddParam easeEnterpriseAddParam) {
         EaseEnterprise easeEnterprise = BeanUtil.toBean(easeEnterpriseAddParam, EaseEnterprise.class);
         this.save(easeEnterprise);
+        // 审批流程
+        this.setAuditTable(easeEnterprise);
     }
 
     @Transactional(rollbackFor = Exception.class)
@@ -69,6 +95,8 @@ public class EaseEnterpriseServiceImpl extends ServiceImpl<EaseEnterpriseMapper,
         EaseEnterprise easeEnterprise = this.queryEntity(easeEnterpriseEditParam.getId());
         BeanUtil.copyProperties(easeEnterpriseEditParam, easeEnterprise);
         this.updateById(easeEnterprise);
+        // 审批流程
+        this.setAuditTable(easeEnterprise);
     }
 
     @Transactional(rollbackFor = Exception.class)
@@ -83,6 +111,53 @@ public class EaseEnterpriseServiceImpl extends ServiceImpl<EaseEnterpriseMapper,
         return this.queryEntity(easeEnterpriseIdParam.getId());
     }
 
+    @SuppressWarnings("all")
+    private void setAuditTable(EaseEnterprise easeEnterprise) {
+        // 审批流程(状态->0:保存状态;1:提交(申请中);2:驳回;3:审核通过)
+        if (0 != easeEnterprise.getStatus()) {
+            QueryWrapper<AuditRequest> wrapper = new QueryWrapper<>();
+            wrapper.lambda().eq(AuditRequest::getRequestId, easeEnterprise.getId());
+            // 审批状态
+            AuditRequest request = new AuditRequest();
+            // 管理审批状态
+            request.setRequestId(easeEnterprise.getId());
+            // 好粮油标记
+            request.setType(10);
+            request.setStep(10);
+            request.setAuditUserId(easeEnterprise.getCreateUser());
+            // 状态 0:待审核;1:已审核;2:驳回
+            if (1 == easeEnterprise.getStatus()) {
+                request.setAuditStatus(0);
+                request.setAuditAdvice("待审核");
+                // 判断驳回再次提交
+                AuditRequest request1 = auditRequestMapper.selectOne(wrapper);
+                if (ObjectUtil.isNotEmpty(request1))
+                    auditRequestMapper.update(request, wrapper);
+                else
+                    auditRequestMapper.insert(request);
+            } else if (3 == easeEnterprise.getStatus()) {
+                request.setAuditStatus(1);
+                request.setAuditAdvice("审核通过");
+                auditRequestMapper.update(request, wrapper);
+            } else if (2 == easeEnterprise.getStatus()) {
+                request.setAuditStatus(2);
+                request.setAuditAdvice("驳回");
+                auditRequestMapper.update(request, wrapper);
+            }
+
+            // 审批记录
+            AuditRecord record = new AuditRecord();
+            record.setRequestId(easeEnterprise.getId());
+            record.setAuditStatus(request.getAuditStatus());
+            record.setAuditRequestId(easeEnterprise.getId());
+            record.setType(10);
+            record.setStep(10);
+            record.setAuditAdvice(request.getAuditAdvice());
+            record.setAuditUserId(easeEnterprise.getCreateUser());
+            auditRecordMapper.insert(record);
+        }
+    }
+
     @Override
     public EaseEnterprise queryEntity(String id) {
         EaseEnterprise easeEnterprise = this.getById(id);
@@ -91,4 +166,14 @@ public class EaseEnterpriseServiceImpl extends ServiceImpl<EaseEnterpriseMapper,
         }
         return easeEnterprise;
     }
+
+    @Override
+    public List<Map<String, Object>> getEnterpriseList() {
+        return easeEnterpriseMapper.getEnterpriseList();
+    }
+
+    @Override
+    public Map<String, Object> getCountNumber() {
+        return easeEnterpriseMapper.getCountNumber();
+    }
 }

unis-plugin/unis-plugin-biz/src/main/java/com/unis/circulateMonitor/modular/goodEnterprise/service/impl/GoodEnterpriseServiceImpl.java

@@ -98,6 +98,7 @@ public class GoodEnterpriseServiceImpl extends ServiceImpl<GoodEnterpriseMapper,
         this.setAuditTable(goodEnterprise);
     }
 
+    @SuppressWarnings("all")
     private void setAuditTable(GoodEnterprise goodEnterprise) {
         // 审批流程(状态->0:保存状态;1:提交(申请中);2:驳回;3:审核通过)
         if (0 != goodEnterprise.getStatus()) {