Yansen 2 年前
父节点
当前提交
abaa368c8d
共有 24 个文件被更改,包括 423 次插入61 次删除
  1. 1
    5
      src/main/java/com/yunzhi/inte/controller/CooperationPersonController.java
  2. 1
    1
      src/main/java/com/yunzhi/inte/controller/CooperationUnitsController.java
  3. 1
    0
      src/main/java/com/yunzhi/inte/controller/PackageDetailController.java
  4. 101
    0
      src/main/java/com/yunzhi/inte/controller/UnitsFilesController.java
  5. 68
    36
      src/main/java/com/yunzhi/inte/entity/CooperationPerson.java
  6. 6
    0
      src/main/java/com/yunzhi/inte/entity/CooperationUnits.java
  7. 4
    0
      src/main/java/com/yunzhi/inte/entity/Dishes.java
  8. 3
    0
      src/main/java/com/yunzhi/inte/entity/PackageDetail.java
  9. 42
    0
      src/main/java/com/yunzhi/inte/entity/UnitsFiles.java
  10. 4
    2
      src/main/java/com/yunzhi/inte/mapper/CooperationPersonMapper.java
  11. 1
    0
      src/main/java/com/yunzhi/inte/mapper/StoreMapper.java
  12. 21
    0
      src/main/java/com/yunzhi/inte/mapper/UnitsFilesMapper.java
  13. 4
    2
      src/main/java/com/yunzhi/inte/service/CooperationPersonService.java
  14. 3
    2
      src/main/java/com/yunzhi/inte/service/CooperationUnitsService.java
  15. 13
    0
      src/main/java/com/yunzhi/inte/service/UnitsFilesService.java
  16. 9
    2
      src/main/java/com/yunzhi/inte/service/impl/CooperationPersonServiceImpl.java
  17. 66
    3
      src/main/java/com/yunzhi/inte/service/impl/CooperationUnitsServiceImpl.java
  18. 1
    5
      src/main/java/com/yunzhi/inte/service/impl/StoreServiceImpl.java
  19. 16
    0
      src/main/java/com/yunzhi/inte/service/impl/UnitsFilesServiceImpl.java
  20. 19
    1
      src/main/resources/mapper/CooperationPersonMapper.xml
  21. 1
    1
      src/main/resources/mapper/GuaranteeTaskMapper.xml
  22. 2
    1
      src/main/resources/mapper/PackageDetailMapper.xml
  23. 10
    0
      src/main/resources/mapper/StoreMapper.xml
  24. 26
    0
      src/main/resources/mapper/UnitsFilesMapper.xml

+ 1
- 5
src/main/java/com/yunzhi/inte/controller/CooperationPersonController.java 查看文件

@@ -58,11 +58,7 @@ public class CooperationPersonController extends BaseController {
58 58
                              @ApiParam("人员名称") @RequestParam(value = "name", required = false) String name) throws Exception {
59 59
 
60 60
         IPage<CooperationPerson> pg = new Page<>(pageNum, pageSize);
61
-        QueryWrapper<CooperationPerson> queryWrapper = new QueryWrapper<>();
62
-        queryWrapper.eq(null != orgId, "org_id", orgId);
63
-        queryWrapper.like(!StringUtils.isEmpty(name), "name", name);
64
-        queryWrapper.orderByDesc("id");
65
-        IPage<CooperationPerson> result = cooperationPersonService.page(pg, queryWrapper);
61
+        IPage<CooperationPerson> result = cooperationPersonService.getPageBy(pg, orgId, name);
66 62
 
67 63
         return ResponseBean.success(result);
68 64
     }

+ 1
- 1
src/main/java/com/yunzhi/inte/controller/CooperationUnitsController.java 查看文件

@@ -76,7 +76,7 @@ public class CooperationUnitsController extends BaseController {
76 76
     @ApiOperation("新增数据")
77 77
     @PostMapping("/cooperationUnits")
78 78
     public ResponseBean add(@ApiParam("对象实体") @RequestBody CooperationUnits cooperationUnits) throws Exception {
79
-        cooperationUnitsService.save(cooperationUnits);
79
+        cooperationUnitsService.mergeData(cooperationUnits);
80 80
         return ResponseBean.success(cooperationUnits);
81 81
     }
82 82
 

+ 1
- 0
src/main/java/com/yunzhi/inte/controller/PackageDetailController.java 查看文件

@@ -87,6 +87,7 @@ public class PackageDetailController extends BaseController {
87 87
 
88 88
         Dishes dishes = dishesService.getById(packageDetail.getDishId());
89 89
         dishes.setDishKind(packageDetail.getDishKind());
90
+        dishes.setAmount(packageDetail.getAmount());
90 91
 
91 92
         return ResponseBean.success(dishes);
92 93
     }

+ 101
- 0
src/main/java/com/yunzhi/inte/controller/UnitsFilesController.java 查看文件

@@ -0,0 +1,101 @@
1
+package com.yunzhi.inte.controller;
2
+
3
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
4
+import com.baomidou.mybatisplus.core.metadata.IPage;
5
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
6
+import com.yunzhi.inte.common.BaseController;
7
+import com.yunzhi.inte.common.ResponseBean;
8
+import java.util.List;
9
+import io.swagger.annotations.Api;
10
+import io.swagger.annotations.ApiOperation;
11
+import io.swagger.annotations.ApiParam;
12
+import org.springframework.beans.factory.annotation.Autowired;
13
+import org.springframework.web.bind.annotation.*;
14
+import com.yunzhi.inte.entity.UnitsFiles;
15
+import com.yunzhi.inte.service.UnitsFilesService;
16
+
17
+ /**
18
+ * 机构文件;(units_files)表控制层
19
+ * @author : http://njyunzhi.com
20
+ * @date : 2022-10-26
21
+ */
22
+@Api(tags = "机构文件对象功能接口")
23
+@RestController
24
+@RequestMapping("/")
25
+public class UnitsFilesController extends BaseController {
26
+    
27
+    @Autowired
28
+    private UnitsFilesService unitsFilesService;
29
+    
30
+    /** 
31
+     * 通过ID查询单条数据 
32
+     *
33
+     * @param id 主键
34
+     * @return 实例对象
35
+     */
36
+    @ApiOperation("通过ID查询单条数据")
37
+    @GetMapping("/unitsFiles/{id}")
38
+    public ResponseBean queryById(@ApiParam("对象ID") @PathVariable Integer id) throws Exception {
39
+        return ResponseBean.success(unitsFilesService.getById(id));
40
+    }
41
+    
42
+    /** 
43
+     * 分页查询
44
+     *
45
+     * @param pageNum 当前页码
46
+     * @param pageSize 每页条数
47
+     * @return 查询结果
48
+     */
49
+    @ApiOperation("分页查询")
50
+    @GetMapping("/unitsFiles")
51
+    public ResponseBean list(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
52
+                            @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception {
53
+        
54
+        IPage<UnitsFiles> pg = new Page<>(pageNum, pageSize);
55
+        // QueryWrapper<UnitsFiles> queryWrapper = new QueryWrapper<>();
56
+        // queryWrapper.orderByDesc("create_date");
57
+        IPage<UnitsFiles> result = unitsFilesService.page(pg);
58
+        
59
+        return ResponseBean.success(result);
60
+    }
61
+    
62
+    /** 
63
+     * 新增数据
64
+     *
65
+     * @param unitsFiles 实例对象
66
+     * @return 实例对象
67
+     */
68
+    @ApiOperation("新增数据")
69
+    @PostMapping("/unitsFiles")
70
+    public ResponseBean add(@ApiParam("对象实体") @RequestBody UnitsFiles unitsFiles) throws Exception {
71
+        unitsFilesService.save(unitsFiles);
72
+        return ResponseBean.success(unitsFiles);
73
+    }
74
+    
75
+    /** 
76
+     * 更新数据
77
+     *
78
+     * @param unitsFiles 实例对象
79
+     * @return 实例对象
80
+     */
81
+    @ApiOperation("更新数据")
82
+    @PutMapping("/unitsFiles/{id}")
83
+    public ResponseBean edit(@ApiParam("对象实体") @RequestBody UnitsFiles unitsFiles,
84
+                            @ApiParam("对象ID") @PathVariable Integer id ) throws Exception {
85
+        unitsFilesService.updateById(unitsFiles);
86
+        return ResponseBean.success(unitsFiles);
87
+    }
88
+    
89
+    /** 
90
+     * 通过主键删除数据
91
+     *
92
+     * @param id 主键
93
+     * @return 是否成功
94
+     */
95
+    @ApiOperation("通过主键删除数据")
96
+    @DeleteMapping("/unitsFiles/{id}")
97
+    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable Integer id){
98
+        unitsFilesService.removeLogicById(id);
99
+        return ResponseBean.success("success");
100
+    }
101
+}

+ 68
- 36
src/main/java/com/yunzhi/inte/entity/CooperationPerson.java 查看文件

@@ -1,60 +1,92 @@
1 1
 package com.yunzhi.inte.entity;
2 2
 
3
+import com.baomidou.mybatisplus.annotation.TableField;
3 4
 import io.swagger.annotations.ApiModel;
4 5
 import io.swagger.annotations.ApiModelProperty;
5 6
 import com.baomidou.mybatisplus.annotation.IdType;
6 7
 import com.baomidou.mybatisplus.annotation.TableName;
7 8
 import com.baomidou.mybatisplus.annotation.TableId;
9
+
8 10
 import java.io.Serializable;
9 11
 import java.util.Date;
12
+
10 13
 import lombok.Data;
11 14
 import lombok.EqualsAndHashCode;
12 15
 import lombok.experimental.Accessors;
13 16
 
14
- /**
17
+/**
15 18
  * 保障机构人员;
19
+ *
16 20
  * @author : http://www.chiner.pro
17 21
  * @date : 2022-10-24
18 22
  */
19 23
 @Data
20 24
 @EqualsAndHashCode(callSuper = false)
21 25
 @Accessors(chain = true)
22
-@ApiModel(value = "保障机构人员",description = "")
26
+@ApiModel(value = "保障机构人员", description = "")
23 27
 @TableName("cooperation_person")
24
-public class CooperationPerson implements Serializable,Cloneable{
25
-    /** 人员ID */
26
-    @ApiModelProperty(name = "人员ID",notes = "")
28
+public class CooperationPerson implements Serializable, Cloneable {
29
+    /**
30
+     * 人员ID
31
+     */
32
+    @ApiModelProperty(name = "人员ID", notes = "")
27 33
     @TableId(value = "id", type = IdType.AUTO)
28
-    private Integer id ;
29
-    /** 机构ID */
30
-    @ApiModelProperty(name = "机构ID",notes = "")
31
-    private Integer orgId ;
32
-    /** 姓名 */
33
-    @ApiModelProperty(name = "姓名",notes = "")
34
-    private String name ;
35
-    /** 身份证号 */
36
-    @ApiModelProperty(name = "身份证号",notes = "")
37
-    private String idNo ;
38
-    /** 性别;1男2女9未知 */
39
-    @ApiModelProperty(name = "性别",notes = "1男2女9未知")
40
-    private Integer sex ;
41
-    /** 民族 */
42
-    @ApiModelProperty(name = "民族",notes = "")
43
-    private String ethnic ;
44
-    /** 政治面貌 */
45
-    @ApiModelProperty(name = "政治面貌",notes = "")
46
-    private String politicalStatus ;
47
-    /** 联系电话 */
48
-    @ApiModelProperty(name = "联系电话",notes = "")
49
-    private String phone ;
50
-    /** 是否健康证 */
51
-    @ApiModelProperty(name = "是否健康证",notes = "")
52
-    private Integer isHealthCertificate ;
53
-    /** 家庭住址 */
54
-    @ApiModelProperty(name = "家庭住址",notes = "")
55
-    private String homeAddr ;
56
-    /** 状态 */
57
-    @ApiModelProperty(name = "状态",notes = "")
58
-    private Integer status ;
34
+    private Integer id;
35
+    /**
36
+     * 机构ID
37
+     */
38
+    @ApiModelProperty(name = "机构ID", notes = "")
39
+    private Integer orgId;
40
+    /**
41
+     * 机构名称
42
+     */
43
+    @TableField(exist = false)
44
+    @ApiModelProperty(name = "机构名称", notes = "")
45
+    private String orgName;
46
+    /**
47
+     * 姓名
48
+     */
49
+    @ApiModelProperty(name = "姓名", notes = "")
50
+    private String name;
51
+    /**
52
+     * 身份证号
53
+     */
54
+    @ApiModelProperty(name = "身份证号", notes = "")
55
+    private String idNo;
56
+    /**
57
+     * 性别;1男2女9未知
58
+     */
59
+    @ApiModelProperty(name = "性别", notes = "1男2女9未知")
60
+    private Integer sex;
61
+    /**
62
+     * 民族
63
+     */
64
+    @ApiModelProperty(name = "民族", notes = "")
65
+    private String ethnic;
66
+    /**
67
+     * 政治面貌
68
+     */
69
+    @ApiModelProperty(name = "政治面貌", notes = "")
70
+    private String politicalStatus;
71
+    /**
72
+     * 联系电话
73
+     */
74
+    @ApiModelProperty(name = "联系电话", notes = "")
75
+    private String phone;
76
+    /**
77
+     * 是否健康证
78
+     */
79
+    @ApiModelProperty(name = "是否健康证", notes = "")
80
+    private Integer isHealthCertificate;
81
+    /**
82
+     * 家庭住址
83
+     */
84
+    @ApiModelProperty(name = "家庭住址", notes = "")
85
+    private String homeAddr;
86
+    /**
87
+     * 状态
88
+     */
89
+    @ApiModelProperty(name = "状态", notes = "")
90
+    private Integer status;
59 91
 
60 92
 }

+ 6
- 0
src/main/java/com/yunzhi/inte/entity/CooperationUnits.java 查看文件

@@ -1,5 +1,6 @@
1 1
 package com.yunzhi.inte.entity;
2 2
 
3
+import com.baomidou.mybatisplus.annotation.TableField;
3 4
 import io.swagger.annotations.ApiModel;
4 5
 import io.swagger.annotations.ApiModelProperty;
5 6
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -7,6 +8,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
7 8
 import com.baomidou.mybatisplus.annotation.TableId;
8 9
 import java.io.Serializable;
9 10
 import java.util.Date;
11
+import java.util.List;
12
+
10 13
 import lombok.Data;
11 14
 import lombok.EqualsAndHashCode;
12 15
 import lombok.experimental.Accessors;
@@ -66,4 +69,7 @@ public class CooperationUnits implements Serializable,Cloneable{
66 69
     @ApiModelProperty(name = "机构内住宿供应能力(人)",notes = "")
67 70
     private Integer stayCapability ;
68 71
 
72
+    @ApiModelProperty(name = "文件列表",notes = "")
73
+    @TableField(exist = false)
74
+    List<UnitsFiles> fileList;
69 75
 }

+ 4
- 0
src/main/java/com/yunzhi/inte/entity/Dishes.java 查看文件

@@ -64,4 +64,8 @@ public class Dishes implements Serializable,Cloneable{
64 64
     @TableField(exist = false)
65 65
     @ApiModelProperty(name = "菜肴类型", notes = "1主食,2菜肴")
66 66
     private Integer dishKind;
67
+
68
+    @TableField(exist = false)
69
+    @ApiModelProperty(name = "菜肴数量", notes = "")
70
+    private Integer amount;
67 71
 }

+ 3
- 0
src/main/java/com/yunzhi/inte/entity/PackageDetail.java 查看文件

@@ -35,5 +35,8 @@ public class PackageDetail implements Serializable,Cloneable{
35 35
     /** 菜肴类型 */
36 36
     @ApiModelProperty(name = "菜肴类型",notes = "1主食,2菜肴")
37 37
     private Integer dishKind ;
38
+    /** 数量 */
39
+    @ApiModelProperty(name = "数量",notes = "")
40
+    private Integer amount ;
38 41
 
39 42
 }

+ 42
- 0
src/main/java/com/yunzhi/inte/entity/UnitsFiles.java 查看文件

@@ -0,0 +1,42 @@
1
+package com.yunzhi.inte.entity;
2
+
3
+import io.swagger.annotations.ApiModel;
4
+import io.swagger.annotations.ApiModelProperty;
5
+import com.baomidou.mybatisplus.annotation.IdType;
6
+import com.baomidou.mybatisplus.annotation.TableName;
7
+import com.baomidou.mybatisplus.annotation.TableId;
8
+import java.io.Serializable;
9
+import java.util.Date;
10
+import lombok.Data;
11
+import lombok.EqualsAndHashCode;
12
+import lombok.experimental.Accessors;
13
+
14
+ /**
15
+ * 机构文件;
16
+ * @author : http://www.chiner.pro
17
+ * @date : 2022-10-26
18
+ */
19
+@Data
20
+@EqualsAndHashCode(callSuper = false)
21
+@Accessors(chain = true)
22
+@ApiModel(value = "机构文件",description = "")
23
+@TableName("units_files")
24
+public class UnitsFiles implements Serializable,Cloneable{
25
+    /** ID */
26
+    @ApiModelProperty(name = "ID",notes = "")
27
+    @TableId(value = "id", type = IdType.INPUT)
28
+    private Integer id ;
29
+    /** 机构ID */
30
+    @ApiModelProperty(name = "机构ID",notes = "")
31
+    private Integer orgId ;
32
+    /** 文件地址 */
33
+    @ApiModelProperty(name = "文件地址",notes = "")
34
+    private String fileAddr ;
35
+    /** 文件名称 */
36
+    @ApiModelProperty(name = "文件名称",notes = "")
37
+    private String fileName ;
38
+    /** 上传时间 */
39
+    @ApiModelProperty(name = "上传时间",notes = "")
40
+    private Date createDate ;
41
+
42
+}

+ 4
- 2
src/main/java/com/yunzhi/inte/mapper/CooperationPersonMapper.java 查看文件

@@ -1,6 +1,7 @@
1 1
 package com.yunzhi.inte.mapper;
2 2
 
3 3
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4
+import com.baomidou.mybatisplus.core.metadata.IPage;
4 5
 import org.apache.ibatis.annotations.Mapper;
5 6
 import org.apache.ibatis.annotations.Param;
6 7
 import com.yunzhi.inte.entity.CooperationPerson;
@@ -12,5 +13,6 @@ import com.yunzhi.inte.entity.CooperationPerson;
12 13
  */
13 14
 @Mapper
14 15
 public interface CooperationPersonMapper  extends BaseMapper<CooperationPerson>{
15
-    
16
-}
16
+
17
+     IPage<CooperationPerson> getPageBy(IPage<CooperationPerson> pg, @Param("orgId") Integer orgId, @Param("name") String name);
18
+ }

+ 1
- 0
src/main/java/com/yunzhi/inte/mapper/StoreMapper.java 查看文件

@@ -25,4 +25,5 @@ public interface StoreMapper  extends BaseMapper<Store>{
25 25
 
26 26
     List<Map<String, Integer>> countDeviceTypeOut(@Param("startDate") String startDate,@Param("endDate") String endDate);
27 27
 
28
+    Integer countDevice();
28 29
 }

+ 21
- 0
src/main/java/com/yunzhi/inte/mapper/UnitsFilesMapper.java 查看文件

@@ -0,0 +1,21 @@
1
+package com.yunzhi.inte.mapper;
2
+
3
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4
+import org.apache.ibatis.annotations.Mapper;
5
+import org.apache.ibatis.annotations.Param;
6
+import com.yunzhi.inte.entity.UnitsFiles;
7
+
8
+import java.util.List;
9
+
10
+/**
11
+ * 机构文件;(units_files)表数据库访问层
12
+ * @author : http://njyunzhi.com
13
+ * @date : 2022-10-26
14
+ */
15
+@Mapper
16
+public interface UnitsFilesMapper  extends BaseMapper<UnitsFiles>{
17
+
18
+     UnitsFiles getByFileAddr(@Param("orgId") Integer orgId, @Param("fileAddr") String fileAddr);
19
+
20
+     int deleteButNotIn(@Param("orgId") Integer orgId, @Param("idList") List<Integer> idList);
21
+ }

+ 4
- 2
src/main/java/com/yunzhi/inte/service/CooperationPersonService.java 查看文件

@@ -1,5 +1,6 @@
1 1
 package com.yunzhi.inte.service;
2 2
 
3
+import com.baomidou.mybatisplus.core.metadata.IPage;
3 4
 import com.baomidou.mybatisplus.extension.service.IService;
4 5
 import com.yunzhi.inte.entity.CooperationPerson;
5 6
 
@@ -9,5 +10,6 @@ import com.yunzhi.inte.entity.CooperationPerson;
9 10
  * @date : 2022-10-24
10 11
  */
11 12
 public interface CooperationPersonService extends IBaseService<CooperationPerson> {
12
-    
13
-}
13
+
14
+     IPage<CooperationPerson> getPageBy(IPage<CooperationPerson> pg, Integer orgId, String name);
15
+ }

+ 3
- 2
src/main/java/com/yunzhi/inte/service/CooperationUnitsService.java 查看文件

@@ -9,5 +9,6 @@ import com.yunzhi.inte.entity.CooperationUnits;
9 9
  * @date : 2022-10-24
10 10
  */
11 11
 public interface CooperationUnitsService extends IBaseService<CooperationUnits> {
12
-    
13
-}
12
+
13
+     void mergeData(CooperationUnits cooperationUnits) throws Exception;
14
+ }

+ 13
- 0
src/main/java/com/yunzhi/inte/service/UnitsFilesService.java 查看文件

@@ -0,0 +1,13 @@
1
+package com.yunzhi.inte.service;
2
+
3
+import com.baomidou.mybatisplus.extension.service.IService;
4
+import com.yunzhi.inte.entity.UnitsFiles;
5
+
6
+ /**
7
+ * 机构文件;(units_files)表服务接口
8
+ * @author : http://njyunzhi.com
9
+ * @date : 2022-10-26
10
+ */
11
+public interface UnitsFilesService extends IBaseService<UnitsFiles> {
12
+    
13
+}

+ 9
- 2
src/main/java/com/yunzhi/inte/service/impl/CooperationPersonServiceImpl.java 查看文件

@@ -1,16 +1,23 @@
1 1
 package com.yunzhi.inte.service.impl;
2 2
 
3
+import com.baomidou.mybatisplus.core.metadata.IPage;
3 4
 import org.springframework.beans.factory.annotation.Autowired;
4 5
 import org.springframework.stereotype.Service;
5 6
 import com.yunzhi.inte.entity.CooperationPerson;
6 7
 import com.yunzhi.inte.mapper.CooperationPersonMapper;
7 8
 import com.yunzhi.inte.service.CooperationPersonService;
8
- /**
9
+
10
+/**
9 11
  * 保障机构人员;(cooperation_person)表服务实现类
12
+ *
10 13
  * @author : http://www.chiner.pro
11 14
  * @date : 2022-10-24
12 15
  */
13 16
 @Service
14 17
 public class CooperationPersonServiceImpl extends BaseServiceImpl<CooperationPersonMapper, CooperationPerson> implements CooperationPersonService {
15
-    
18
+
19
+    @Override
20
+    public IPage<CooperationPerson> getPageBy(IPage<CooperationPerson> pg, Integer orgId, String name) {
21
+        return baseMapper.getPageBy(pg, orgId, name);
22
+    }
16 23
 }

+ 66
- 3
src/main/java/com/yunzhi/inte/service/impl/CooperationUnitsServiceImpl.java 查看文件

@@ -1,16 +1,79 @@
1 1
 package com.yunzhi.inte.service.impl;
2 2
 
3
+import com.yunzhi.inte.common.StringUtils;
4
+import com.yunzhi.inte.entity.UnitsFiles;
5
+import com.yunzhi.inte.mapper.UnitsFilesMapper;
3 6
 import org.springframework.beans.factory.annotation.Autowired;
4 7
 import org.springframework.stereotype.Service;
5 8
 import com.yunzhi.inte.entity.CooperationUnits;
6 9
 import com.yunzhi.inte.mapper.CooperationUnitsMapper;
7 10
 import com.yunzhi.inte.service.CooperationUnitsService;
8
- /**
11
+import org.springframework.transaction.annotation.Transactional;
12
+
13
+import java.time.LocalDateTime;
14
+import java.util.ArrayList;
15
+import java.util.HashMap;
16
+import java.util.List;
17
+
18
+/**
9 19
  * 保障机构;(cooperation_units)表服务实现类
10 20
  * @author : http://www.chiner.pro
11 21
  * @date : 2022-10-24
12 22
  */
13 23
 @Service
14 24
 public class CooperationUnitsServiceImpl extends BaseServiceImpl<CooperationUnitsMapper, CooperationUnits> implements CooperationUnitsService {
15
-    
16
-}
25
+
26
+    @Autowired
27
+    UnitsFilesMapper unitsFilesMapper;
28
+
29
+  @Override
30
+  @Transactional(rollbackFor = Exception.class)
31
+  public void mergeData(CooperationUnits cooperationUnits) throws Exception {
32
+      if (StringUtils.isEmpty(cooperationUnits.getName())) {
33
+          throw new Exception("机构名称不能为空");
34
+      }
35
+
36
+      LocalDateTime now = LocalDateTime.now();
37
+
38
+      Integer id = cooperationUnits.getId();
39
+      if (id == null) {
40
+          CooperationUnits origin = getExistBy("name", cooperationUnits.getName(), false, false);
41
+          if (origin != null) {
42
+              throw new Exception("机构名称重复");
43
+          }
44
+
45
+          save(cooperationUnits);
46
+          id = cooperationUnits.getId();
47
+      } else {
48
+          CooperationUnits exists = getByButNot("name", cooperationUnits.getName(), "id", cooperationUnits.getId(), false);
49
+          if (exists != null) {
50
+              throw new Exception("机构名称重复");
51
+          }
52
+          updateById(cooperationUnits);
53
+      }
54
+
55
+      List<UnitsFiles> fileList = cooperationUnits.getFileList();
56
+      if (null == fileList || fileList.size() == 0) {
57
+          unitsFilesMapper.deleteByMap(new HashMap<String, Object>(){{
58
+              put("org_id", cooperationUnits.getId());
59
+          }});
60
+      } else {
61
+          List<Integer> idList = new ArrayList<>();
62
+          for (UnitsFiles file : fileList) {
63
+              file.setOrgId(cooperationUnits.getId());
64
+
65
+              UnitsFiles exits = unitsFilesMapper.getByFileAddr(cooperationUnits.getId(), file.getFileAddr());
66
+              if (null != exits) {
67
+                  file.setId(exits.getId());
68
+                  unitsFilesMapper.updateById(file);
69
+              } else {
70
+                  unitsFilesMapper.insert(file);
71
+              }
72
+
73
+              idList.add(file.getId());
74
+          }
75
+
76
+          unitsFilesMapper.deleteButNotIn(cooperationUnits.getId(), idList);
77
+      }
78
+  }
79
+ }

+ 1
- 5
src/main/java/com/yunzhi/inte/service/impl/StoreServiceImpl.java 查看文件

@@ -44,11 +44,7 @@ public class StoreServiceImpl extends BaseServiceImpl<StoreMapper, Store> implem
44 44
 
45 45
     @Override
46 46
     public Integer countDevice() {
47
-        QueryWrapper<Store> queryWrapper = new QueryWrapper<>();
48
-        queryWrapper.eq("is_device", 1);
49
-        queryWrapper.eq("status", Constants.STATUS_NORMAL);
50
-
51
-        return count(queryWrapper);
47
+        return baseMapper.countDevice();
52 48
     }
53 49
 
54 50
     @Override

+ 16
- 0
src/main/java/com/yunzhi/inte/service/impl/UnitsFilesServiceImpl.java 查看文件

@@ -0,0 +1,16 @@
1
+package com.yunzhi.inte.service.impl;
2
+
3
+import org.springframework.beans.factory.annotation.Autowired;
4
+import org.springframework.stereotype.Service;
5
+import com.yunzhi.inte.entity.UnitsFiles;
6
+import com.yunzhi.inte.mapper.UnitsFilesMapper;
7
+import com.yunzhi.inte.service.UnitsFilesService;
8
+ /**
9
+ * 机构文件;(units_files)表服务实现类
10
+ * @author : http://www.chiner.pro
11
+ * @date : 2022-10-26
12
+ */
13
+@Service
14
+public class UnitsFilesServiceImpl extends BaseServiceImpl<UnitsFilesMapper, UnitsFiles> implements UnitsFilesService {
15
+    
16
+}

+ 19
- 1
src/main/resources/mapper/CooperationPersonMapper.xml 查看文件

@@ -2,5 +2,23 @@
2 2
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3 3
 
4 4
 <mapper namespace="com.yunzhi.inte.mapper.CooperationPersonMapper">
5
-    
5
+
6
+    <select id="getPageBy" resultType="com.yunzhi.inte.entity.CooperationPerson">
7
+        SELECT
8
+            t.*,
9
+            s.`name` AS org_name
10
+        FROM
11
+            cooperation_person t
12
+                INNER JOIN cooperation_units s ON t.org_id = s.id
13
+        WHERE
14
+            1 = 1
15
+          <if test="null != orgId">
16
+              AND t.org_id = #{orgId}
17
+          </if>
18
+          <if test="null != name and '' != name">
19
+              AND t.NAME LIKE CONCAT( '%', #{name}, '%' )
20
+          </if>
21
+        ORDER BY
22
+            t.id DESC
23
+    </select>
6 24
 </mapper>

+ 1
- 1
src/main/resources/mapper/GuaranteeTaskMapper.xml 查看文件

@@ -5,7 +5,7 @@
5 5
 
6 6
     <select id="sumPerson" resultType="java.lang.Integer">
7 7
         SELECT
8
-            sum( t.total_person_num )
8
+            sum( IFNULL(t.total_person_num, 0) )
9 9
         FROM
10 10
             guarantee_task t
11 11
         WHERE

+ 2
- 1
src/main/resources/mapper/PackageDetailMapper.xml 查看文件

@@ -6,7 +6,8 @@
6 6
     <select id="getPageByPackage" resultType="com.yunzhi.inte.entity.Dishes">
7 7
         SELECT
8 8
             t.*,
9
-            s.dish_kind
9
+            s.dish_kind,
10
+            s.amount
10 11
         FROM
11 12
             dishes t
12 13
                 INNER JOIN package_detail s ON t.id = s.dish_id

+ 10
- 0
src/main/resources/mapper/StoreMapper.xml 查看文件

@@ -69,4 +69,14 @@
69 69
         WHERE
70 70
             t.`status` = 1
71 71
     </select>
72
+    <select id="countDevice" resultType="java.lang.Integer">
73
+        SELECT
74
+            count( 1 )
75
+        FROM
76
+            store t
77
+                INNER JOIN store_type s ON t.type_id = s.id
78
+        WHERE
79
+            s.is_device = 1
80
+          AND t.`status` = 1
81
+    </select>
72 82
 </mapper>

+ 26
- 0
src/main/resources/mapper/UnitsFilesMapper.xml 查看文件

@@ -0,0 +1,26 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3
+
4
+<mapper namespace="com.yunzhi.inte.mapper.UnitsFilesMapper">
5
+    <delete id="deleteButNotIn">
6
+        DELETE t
7
+        FROM
8
+            units_files t
9
+        WHERE
10
+            t.org_id = #{orgId}
11
+            AND t.id NOT IN
12
+            <foreach item="item" collection="idList" separator="," open="(" close=")" index="">
13
+                #{item}
14
+            </foreach>
15
+    </delete>
16
+
17
+    <select id="getByFileAddr" resultType="com.yunzhi.inte.entity.UnitsFiles">
18
+        SELECT
19
+            *
20
+        FROM
21
+            units_files t
22
+        WHERE
23
+            t.org_id = #{orgId}
24
+          AND t.file_addr = #{fileAddr}
25
+    </select>
26
+</mapper>