清运公司修改

njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/controller/BizCompanyController.java

@@ -8,6 +8,7 @@ import com.njzscloud.supervisory.biz.pojo.entity.BizCompanyEntity;
 import com.njzscloud.supervisory.biz.pojo.param.ModifyBizCompanyParam;
 import com.njzscloud.supervisory.biz.pojo.param.SearchCompanyParam;
 import com.njzscloud.supervisory.biz.pojo.param.SettlementWayParam;
+import com.njzscloud.supervisory.biz.pojo.param.SsrParam;
 import com.njzscloud.supervisory.biz.pojo.result.SearchCompanyResult;
 import com.njzscloud.supervisory.biz.pojo.result.StationResult;
 import com.njzscloud.supervisory.biz.service.BizCompanyService;
@@ -62,6 +63,39 @@ public class BizCompanyController {
         return R.success();
     }
 
+    /**
+     * 修改服务范围和备注
+     *
+     * @param ssr 数据
+     */
+    @PostMapping("/updateSsr")
+    public R<?> updateSsr(@RequestBody SsrParam ssr) {
+        BizCompanyEntity entity = new BizCompanyEntity();
+        entity.setId(ssr.getId());
+        if (!ssr.getServiceScope().isEmpty()) {
+            entity.setServiceScope(ssr.getServiceScope());
+        }
+        if (ssr.getRemark() != null) {
+            entity.setRemark(ssr.getRemark());
+        }
+        bizCompanyService.updateById(entity);
+        return R.success();
+    }
+
+    /**
+     * 修改是否可选
+     *
+     * @param id Id
+     */
+    @GetMapping("/enabled")
+    public R<?> enabled(@RequestParam("id") Long id, @RequestParam("enabled") Boolean enabled) {
+        BizCompanyEntity entity = new BizCompanyEntity();
+        entity.setId(id);
+        entity.setEnabled(enabled);
+        bizCompanyService.updateById(entity);
+        return R.success();
+    }
+
     /**
      * 撤销
      *

njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/entity/BizCompanyEntity.java

@@ -1,6 +1,7 @@
 package com.njzscloud.supervisory.biz.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.njzscloud.common.mp.support.handler.j.JsonTypeHandler;
 import com.njzscloud.supervisory.biz.constant.AuditStatus;
 import com.njzscloud.supervisory.biz.constant.BizObj;
 import lombok.Getter;
@@ -9,6 +10,7 @@ import lombok.experimental.Accessors;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * 企业信息
@@ -197,4 +199,20 @@ public class BizCompanyEntity {
      */
     private String settlementWay;
 
+    /**
+     * 企业是否可选; 0-->否、1-->是
+     */
+    private Boolean enabled;
+
+    /**
+     * 服务范围
+     */
+    @TableField(typeHandler = JsonTypeHandler.class)
+    private List<String> serviceScope;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
 }

njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/param/SearchCompanyParam.java

@@ -41,4 +41,9 @@ public class SearchCompanyParam {
      * 审核状态; 字典代码：audit_status
      */
     private AuditStatus auditStatus;
+
+    /**
+     * 企业是否可选; 0-->否、1-->是
+     */
+    private Boolean enabled;
 }

njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/param/SsrParam.java

@@ -0,0 +1,33 @@
+package com.njzscloud.supervisory.biz.pojo.param;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+/**
+ * 企业信息
+ */
+@Getter
+@Setter
+@ToString
+@Accessors(chain = true)
+public class SsrParam {
+
+    /**
+     * Id
+     */
+    private Long id;
+
+    /**
+     * 服务范围
+     */
+    private List<String> serviceScope;
+
+    /**
+     * 备注
+     */
+    private String remark;
+}

njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/result/SearchCompanyResult.java

@@ -1,5 +1,7 @@
 package com.njzscloud.supervisory.biz.pojo.result;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.njzscloud.common.mp.support.handler.j.JsonTypeHandler;
 import com.njzscloud.supervisory.biz.constant.AuditStatus;
 import com.njzscloud.supervisory.biz.constant.BizObj;
 import lombok.Getter;
@@ -10,6 +12,7 @@ import lombok.experimental.Accessors;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * 企业信息
@@ -153,4 +156,20 @@ public class SearchCompanyResult {
     private String idcardFront;
     private String idcardBack;
 
+    /**
+     * 企业是否可选; 0-->否、1-->是
+     */
+    private Boolean enabled;
+
+    /**
+     * 服务范围
+     */
+    @TableField(typeHandler = JsonTypeHandler.class)
+    private List<String> serviceScope;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
 }

njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/service/BizCompanyService.java

@@ -191,11 +191,13 @@ public class BizCompanyService extends ServiceImpl<BizCompanyMapper, BizCompanyE
         String stationName = searchCompanyParam.getStationName();
         String legalRepresentative = searchCompanyParam.getLegalRepresentative();
         Integer station = searchCompanyParam.getStation();
+        Boolean enabled = searchCompanyParam.getEnabled();
         return PageResult.of(baseMapper.paging(pageParam.toPage(), Wrappers.query()
 //                .eq("a.station", Boolean.FALSE)
                         .eq("a.deleted", 0)
                         .eq(StrUtil.isNotBlank(aStatus), "a.audit_status", aStatus)
                         .eq(station != null, "a.station", station)
+                        .eq(enabled != null, "a.enabled", enabled)
 //                .eq(StrUtil.isNotBlank(searchCompanyParam.getStation()), "a.station", searchCompanyParam.getStation())
                         .in(CollUtil.isNotEmpty(bizObjList), "b.biz_obj", bizObjList)
                         .like(StrUtil.isNotBlank(companyName), "a.company_name", companyName)

njzscloud-svr/src/main/java/com/njzscloud/supervisory/customer/pojo/result/SearchCompanyResult.java

@@ -1,5 +1,7 @@
 package com.njzscloud.supervisory.customer.pojo.result;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.njzscloud.common.mp.support.handler.j.JsonTypeHandler;
 import com.njzscloud.supervisory.biz.constant.AuditStatus;
 import lombok.Getter;
 import lombok.Setter;
@@ -7,6 +9,7 @@ import lombok.ToString;
 import lombok.experimental.Accessors;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 @Getter
 @Setter
@@ -109,4 +112,20 @@ public class SearchCompanyResult {
     private String idcardEndTime;
     private String idcardFront;
     private String idcardBack;
+
+    /**
+     * 企业是否可选; 0-->否、1-->是
+     */
+    private Boolean enabled;
+
+    /**
+     * 服务范围
+     */
+    @TableField(typeHandler = JsonTypeHandler.class)
+    private List<String> serviceScope;
+
+    /**
+     * 备注
+     */
+    private String remark;
 }

njzscloud-svr/src/main/resources/mapper/customer/CustomerMapper.xml

@@ -7,6 +7,7 @@
         <id column="company_id" property="id"/>
         <result column="contacts_phone" property="phone"/>
         <result column="audit_status" property="auditStatus" typeHandler="com.njzscloud.common.mp.support.handler.e.EnumTypeHandlerDealer"/>
+        <result property="serviceScope" column="service_scope" typeHandler="com.njzscloud.common.mp.support.handler.j.JsonTypeHandler"/>
         <result column="idcard" property="idcard"/>
         <result column="idcard_Start_Time" property="idcardStartTime"/>
         <result column="idcard_end_time" property="idcardEndTime"/>
@@ -57,7 +58,10 @@
         c.idcard_Start_Time,
         c.idcard_end_time,
         c.idcard_front,
-        c.idcard_back
+        c.idcard_back,
+        c.enabled,
+        c.service_scope,
+        c.remark
         FROM sys_user a
         INNER JOIN sys_user_account b ON b.user_id = a.id AND b.deleted = 0
         LEFT JOIN biz_company c ON c.user_id = a.id AND c.station = 0 AND c.deleted = 0