Merge branch 'develop' of http://gitlab.sothing.top/843502640/jyzb_platformV2 into develop-lxh

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/OrgTreeDto.java

+package com.junmp.jyzb.api.bean.dto;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+public class OrgTreeDto {
+    private String name;
+    private String code;
+    private Integer type;
+    private List<OrgTreeDto> child = new ArrayList<>();
+    public void addChild(OrgTreeDto child) {
+        this.child.add(child);
+    }
+}
+
+
+

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/QueryOrgReq.java

+package com.junmp.jyzb.api.bean.query;
+
+import com.junmp.v2.common.bean.request.BaseRequest;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+//@EqualsAndHashCode(callSuper = true)
+public class QueryOrgReq {
+    private String orgCode;
+}
+
+

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/OrgUpdateReq.java → jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/OrgUpdateReq.java

-package com.junmp.jyzb.api.bean.query;
+package com.junmp.jyzb.api.bean.req;
 
 import com.junmp.v2.common.bean.request.BaseRequest;
 import com.junmp.v2.common.bean.request.ValidationApi;

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/UpdateEquipmentSizeReq.java

@@ -24,5 +24,5 @@ public class UpdateEquipmentSizeReq {
 
     private BigDecimal price;
     @NotBlank(message = "状态值不能为空", groups = {ValidationApi.edit.class})
-    private Integer state;
+    private String state;
 }

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/UpdateEquipmentTypeReq.java

@@ -10,9 +10,9 @@ import java.util.List;
 @Data
 
 public class UpdateEquipmentTypeReq {
-    @NotNull(message = "装备主键不能为空", groups = {ValidationApi.edit.class, ValidationApi.delete.class, ValidationApi.detail.class})
+    @NotBlank(message = "装备主键不能为空", groups = {ValidationApi.edit.class, ValidationApi.delete.class, ValidationApi.detail.class})
     private String id;
-    @NotNull(message = "状态不能为空", groups = { ValidationApi.updateStatus.class})
+    @NotBlank(message = "状态不能为空", groups = { ValidationApi.updateStatus.class})
     private String state;
 
     private String unitType;

jyzb-biz/src/main/java/com/junmp/jyzb/controller/PubOrgController.java

 package com.junmp.jyzb.controller;
 
+import com.junmp.jyzb.api.bean.dto.OrgTreeDto;
+import com.junmp.jyzb.api.bean.query.QueryOrgReq;
 import com.junmp.jyzb.service.PubOrgService;
 import com.junmp.jyzb.utils.ResponseResult;
 import com.junmp.v2.common.bean.response.ApiRes;
@@ -29,13 +31,6 @@ public class PubOrgController {
         return ApiRes.success(pubOrgService.showPubOrgList(orgId));
     }
 
-    @PostMapping("/ShowPubOrgListOld")
-    @ApiOperation("查询组织机构列表_完整版")
-    public ResponseResult showPubOrgListOld(@RequestBody Map<String, Object> orgId) {
-        //传入当前的组织机构id，展示所有本级及下级的
-        ResponseResult returnMsg = pubOrgService.showPubOrgListOld(orgId);
-        return returnMsg;
-    }
 
     @PostMapping("/SetOrgParentIds")
     @ApiOperation("填充组织机构的parent_ids字段")
@@ -54,8 +49,8 @@ public class PubOrgController {
 
     @PostMapping("/GetOrgDetail")
     @ApiOperation("查询组织机构详细信息")
-    public ResponseResult getOrgDetail(@RequestBody Map<String, Object> msg) {
-        ResponseResult returnMsg = pubOrgService.getOrgDetail(msg);
+    public List<OrgTreeDto> getOrgDetail(@RequestBody QueryOrgReq req) {
+        List<OrgTreeDto> returnMsg = pubOrgService.getOrgList(req);
         return returnMsg;
     }
 

jyzb-biz/src/main/java/com/junmp/jyzb/controller/WarehouseController.java

@@ -32,31 +32,17 @@ public class WarehouseController {
     @Resource
     public ShelfService shelfService;
 
-//    @PostMapping("/AddWarehouse")
-//    @ApiOperation("添加仓库")
-//    public ResponseResult addWarehouse(@RequestBody Map<String,Object> msg) {
-//        ResponseResult returnMsg = warehouseService.addWarehouse(msg);
-//        return returnMsg;
-//    }
 
     @PostMapping("/AddWarehouse")
     @ApiOperation("添加仓库")
     public ApiRes<Boolean> addWarehouse(@RequestBody @Validated(WarehouseReq.add.class) WarehouseReq req) {
-        //ResponseResult returnMsg = warehouseService.addWarehouse(msg);
         return ApiRes.success(warehouseService.addWarehouse(req));
     }
 
-//    @PostMapping("/DeleteWarehouse")
-//    @ApiOperation("删除仓库信息")
-//    public ResponseResult deleteWarehouse(@RequestBody Map<String,Object> msg) {
-//        ResponseResult returnMsg = warehouseService.deleteWarehouse(msg);
-//        return returnMsg;
-//    }
 
     @PostMapping("/DeleteWarehouse")
     @ApiOperation("删除仓库信息")
     public ApiRes<Boolean> deleteWarehouse(@RequestBody @Validated(WarehouseReq.delete.class)WarehouseReq req) {
-        //ResponseResult returnMsg = warehouseService.deleteWarehouse(msg);
         return ApiRes.success(warehouseService.deleteWarehouse(req));
     }
 
@@ -70,15 +56,6 @@ public class WarehouseController {
     @ApiOperation("查询仓库列表")
     public ApiRes<List<Warehouse>> getAllWarehouse(@RequestBody WarehouseReq req){
         return ApiRes.success(warehouseService.getAllWarehouse(req));
-
-//        //获取该组织机构下所有警员的id
-//        List<Map<String, Object>> allWarehouse=new ArrayList<>();
-//        List<String> allWarehouseId =warehouseService.getAllWarehouseId(orgId);
-//        for (String warehouseId :allWarehouseId){
-//            Map<String, Object> warehouseMsg = warehouseService.getOneWarehouse(warehouseId);
-//            allWarehouse.add(warehouseMsg);
-//        }
-//        return new ResponseResult(HttpStatus.SUCCESS,ReturnMsg.PASS,allWarehouse);
     }
 
     @PostMapping("/GetWarehouseDetail")

jyzb-biz/src/main/java/com/junmp/jyzb/entity/Supplier.java

@@ -55,12 +55,6 @@ public class Supplier implements Serializable {
     private Date updateTime;
 
 
-    /**
-     * 创建人员
-     */
-    @TableField(value = "create_time", fill = FieldFill.INSERT)
-    private String createUser;
-
 
     /**
      * 更新人ID

jyzb-biz/src/main/java/com/junmp/jyzb/service/PubOrgService.java

 package com.junmp.jyzb.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.junmp.jyzb.api.bean.query.OrgUpdateReq;
+import com.junmp.jyzb.api.bean.dto.OrgTreeDto;
+import com.junmp.jyzb.api.bean.query.QueryOrgReq;
+import com.junmp.jyzb.api.bean.req.OrgUpdateReq;
 import com.junmp.jyzb.utils.ResponseResult;
 
 import java.util.List;
@@ -12,7 +14,6 @@ public interface PubOrgService extends IService<PubOrg> {
 
     List<Map<String,Object>> showPubOrgList(Map<String, Object> orgId);
 
-    ResponseResult showPubOrgListOld(Map<String, Object> orgId);
 
     ResponseResult setShortName(Map<String, Object> orgId);
 
@@ -20,7 +21,7 @@ public interface PubOrgService extends IService<PubOrg> {
 
     ResponseResult setOrgParentIds();
 
-    ResponseResult getOrgDetail(Map<String, Object> orgId);
-
+    List<OrgTreeDto> getOrgList(QueryOrgReq req);
+//    public List<OrgTreeDto> getEquipmentList(QueryOrgReq req)
     ResponseResult changeOrgState(OrgUpdateReq req);
 }

jyzb-biz/src/main/java/com/junmp/jyzb/service/WarehouseService.java

@@ -35,7 +35,6 @@ public interface WarehouseService extends IService<Warehouse> {
      */
     boolean updateWarehouse(WarehouseReq req);
 
-    List<String> getAllWarehouseId(Map<String, Object> orgId);
 
     boolean changeWarehouseState(WarehouseReq req);
 

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/EquipmentSizeServiceImpl.java

@@ -60,6 +60,7 @@ public class EquipmentSizeServiceImpl extends ServiceImpl<EquipmentSizeMapper, E
     @Override
     public Boolean changeSizeState(UpdateEquipmentSizeReq req) {
         EquipmentSize size = this.querySize(req);
+        size.setState(Integer.valueOf(req.getState()));
         return this.updateById(size);
     }
 

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/EquipmentTypeServiceImpl.java

@@ -248,6 +248,7 @@ public class EquipmentTypeServiceImpl extends ServiceImpl<EquipmentTypeMapper, E
         EquipmentType equipment = this.getById(req.getId());
         if (equipment != null) {
             equipment.setState(Integer.valueOf(req.getState()));
+            return this.updateById(equipment);
         }
         return true;
     }

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/SupplierServiceImpl.java

@@ -27,6 +27,7 @@ public class SupplierServiceImpl extends ServiceImpl<SupplierMapper, Supplier> i
     @Override
     public boolean AddSupplier(UpdateSupplierReq req) {
         Supplier supplier = new Supplier();
+        req.setId(UUID.randomUUID().toString());
         BeanPlusUtil.copyProperties(req, supplier);
         return this.save(supplier);
     }