feats

src/main/java/com/yunzhi/inte/controller/CooperationPersonController.java

@@ -0,0 +1,110 @@
+package com.yunzhi.inte.controller;
+
+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.yunzhi.inte.common.BaseController;
+import com.yunzhi.inte.common.ResponseBean;
+
+import java.util.List;
+
+import com.yunzhi.inte.common.StringUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import com.yunzhi.inte.entity.CooperationPerson;
+import com.yunzhi.inte.service.CooperationPersonService;
+
+/**
+ * 保障机构人员;(cooperation_person)表控制层
+ *
+ * @author : http://njyunzhi.com
+ * @date : 2022-10-24
+ */
+@Api(tags = "保障机构人员对象功能接口")
+@RestController
+@RequestMapping("/")
+public class CooperationPersonController extends BaseController {
+
+    @Autowired
+    private CooperationPersonService cooperationPersonService;
+
+    /**
+     * 通过ID查询单条数据
+     *
+     * @param id 主键
+     * @return 实例对象
+     */
+    @ApiOperation("通过ID查询单条数据")
+    @GetMapping("/cooperationPerson/{id}")
+    public ResponseBean queryById(@ApiParam("对象ID") @PathVariable Integer id) throws Exception {
+        return ResponseBean.success(cooperationPersonService.getById(id));
+    }
+
+    /**
+     * 分页查询
+     *
+     * @param pageNum  当前页码
+     * @param pageSize 每页条数
+     * @return 查询结果
+     */
+    @ApiOperation("分页查询")
+    @GetMapping("/cooperationPerson")
+    public ResponseBean list(@ApiParam("页码") @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                             @ApiParam("单页数据量") @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                             @ApiParam("机构ID") @RequestParam(value = "orgId", required = false) Integer orgId,
+                             @ApiParam("人员名称") @RequestParam(value = "name", required = false) String name) throws Exception {
+
+        IPage<CooperationPerson> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<CooperationPerson> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(null != orgId, "org_id", orgId);
+        queryWrapper.like(!StringUtils.isEmpty(name), "name", name);
+        queryWrapper.orderByDesc("id");
+        IPage<CooperationPerson> result = cooperationPersonService.page(pg, queryWrapper);
+
+        return ResponseBean.success(result);
+    }
+
+    /**
+     * 新增数据
+     *
+     * @param cooperationPerson 实例对象
+     * @return 实例对象
+     */
+    @ApiOperation("新增数据")
+    @PostMapping("/cooperationPerson")
+    public ResponseBean add(@ApiParam("对象实体") @RequestBody CooperationPerson cooperationPerson) throws Exception {
+        cooperationPersonService.save(cooperationPerson);
+        return ResponseBean.success(cooperationPerson);
+    }
+
+    /**
+     * 更新数据
+     *
+     * @param cooperationPerson 实例对象
+     * @return 实例对象
+     */
+    @ApiOperation("更新数据")
+    @PutMapping("/cooperationPerson/{id}")
+    public ResponseBean edit(@ApiParam("对象实体") @RequestBody CooperationPerson cooperationPerson,
+                             @ApiParam("对象ID") @PathVariable Integer id) throws Exception {
+        cooperationPerson.setId(id);
+        cooperationPersonService.updateById(cooperationPerson);
+        return ResponseBean.success(cooperationPerson);
+    }
+
+    /**
+     * 通过主键删除数据
+     *
+     * @param id 主键
+     * @return 是否成功
+     */
+    @ApiOperation("通过主键删除数据")
+    @DeleteMapping("/cooperationPerson/{id}")
+    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable Integer id) {
+        cooperationPersonService.removeById(id);
+        return ResponseBean.success("success");
+    }
+}

src/main/java/com/yunzhi/inte/controller/CooperationUnitsController.java

@@ -5,7 +5,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.inte.common.BaseController;
 import com.yunzhi.inte.common.ResponseBean;
+
 import java.util.List;
+
+import com.yunzhi.inte.common.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -14,8 +17,9 @@ import org.springframework.web.bind.annotation.*;
 import com.yunzhi.inte.entity.CooperationUnits;
 import com.yunzhi.inte.service.CooperationUnitsService;
 
- /**
+/**
  * 保障机构;(cooperation_units)表控制层
+ *
  * @author : http://njyunzhi.com
  * @date : 2022-10-24
  */
@@ -23,12 +27,12 @@ import com.yunzhi.inte.service.CooperationUnitsService;
 @RestController
 @RequestMapping("/")
 public class CooperationUnitsController extends BaseController {
-    
+
     @Autowired
     private CooperationUnitsService cooperationUnitsService;
-    
-    /** 
-     * 通过ID查询单条数据 
+
+    /**
+     * 通过ID查询单条数据
      *
      * @param id 主键
      * @return 实例对象
@@ -38,28 +42,32 @@ public class CooperationUnitsController extends BaseController {
     public ResponseBean queryById(@ApiParam("对象ID") @PathVariable Integer id) throws Exception {
         return ResponseBean.success(cooperationUnitsService.getById(id));
     }
-    
-    /** 
+
+    /**
      * 分页查询
      *
-     * @param pageNum 当前页码
+     * @param pageNum  当前页码
      * @param pageSize 每页条数
      * @return 查询结果
      */
     @ApiOperation("分页查询")
     @GetMapping("/cooperationUnits")
-    public ResponseBean list(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                            @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception {
-        
+    public ResponseBean list(@ApiParam("页码") @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                             @ApiParam("单页数据量") @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                             @ApiParam("名称") @RequestParam(value = "name", required = false) String name,
+                             @ApiParam("机构类别") @RequestParam(value = "orgType", required = false) String orgType) throws Exception {
+
         IPage<CooperationUnits> pg = new Page<>(pageNum, pageSize);
-        // QueryWrapper<CooperationUnits> queryWrapper = new QueryWrapper<>();
-        // queryWrapper.orderByDesc("create_date");
-        IPage<CooperationUnits> result = cooperationUnitsService.page(pg);
-        
+        QueryWrapper<CooperationUnits> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like(!StringUtils.isEmpty(name), "name", name);
+        queryWrapper.like(!StringUtils.isEmpty(orgType), "org_type", orgType);
+        queryWrapper.orderByDesc("id");
+        IPage<CooperationUnits> result = cooperationUnitsService.page(pg, queryWrapper);
+
         return ResponseBean.success(result);
     }
-    
-    /** 
+
+    /**
      * 新增数据
      *
      * @param cooperationUnits 实例对象
@@ -71,8 +79,8 @@ public class CooperationUnitsController extends BaseController {
         cooperationUnitsService.save(cooperationUnits);
         return ResponseBean.success(cooperationUnits);
     }
-    
-    /** 
+
+    /**
      * 更新数据
      *
      * @param cooperationUnits 实例对象
@@ -81,12 +89,13 @@ public class CooperationUnitsController extends BaseController {
     @ApiOperation("更新数据")
     @PutMapping("/cooperationUnits/{id}")
     public ResponseBean edit(@ApiParam("对象实体") @RequestBody CooperationUnits cooperationUnits,
-                            @ApiParam("对象ID") @PathVariable Integer id ) throws Exception {
+                             @ApiParam("对象ID") @PathVariable Integer id) throws Exception {
+        cooperationUnits.setId(id);
         cooperationUnitsService.updateById(cooperationUnits);
         return ResponseBean.success(cooperationUnits);
     }
-    
-    /** 
+
+    /**
      * 通过主键删除数据
      *
      * @param id 主键
@@ -94,8 +103,8 @@ public class CooperationUnitsController extends BaseController {
      */
     @ApiOperation("通过主键删除数据")
     @DeleteMapping("/cooperationUnits/{id}")
-    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable Integer id){
-        cooperationUnitsService.removeLogicById(id);
+    public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable Integer id) {
+        cooperationUnitsService.removeById(id);
         return ResponseBean.success("success");
     }
 }

src/main/java/com/yunzhi/inte/controller/GuaranteeDetailController.java

@@ -120,13 +120,13 @@ public class GuaranteeDetailController extends BaseController {
         for (GuaranteeDetail item : list) {
             item.setGuaranteeId(guaranteeId);
 
-            Dishes dishes = dishesService.getById(item.getDishId());
-            if (null != dishes) {
-                Integer price = dishes.getPrice();
-                Double calorie = dishes.getCalorie();
-                costs += null == price ? 0 : price;
-                calorieTotal += null == calorie ? 0 : calorie;
-            }
+//            Dishes dishes = dishesService.getById(item.getDishId());
+//            if (null != dishes) {
+//                Integer price = dishes.getPrice();
+//                Double calorie = dishes.getCalorie();
+//                costs += null == price ? 0 : price;
+//                calorieTotal += null == calorie ? 0 : calorie;
+//            }
         }
 
         // 更新成本

src/main/java/com/yunzhi/inte/controller/PackageDetailController.java

@@ -86,6 +86,7 @@ public class PackageDetailController extends BaseController {
         packageDetailService.save(packageDetail);
 
         Dishes dishes = dishesService.getById(packageDetail.getDishId());
+        dishes.setDishKind(packageDetail.getDishKind());
 
         return ResponseBean.success(dishes);
     }

src/main/java/com/yunzhi/inte/controller/SupportCapabilityController.java

@@ -82,7 +82,16 @@ public class SupportCapabilityController extends BaseController {
     @PutMapping("/supportCapability/{id}")
     public ResponseBean edit(@ApiParam("对象实体") @RequestBody SupportCapability supportCapability,
                             @ApiParam("对象ID") @PathVariable Integer id ) throws Exception {
-        supportCapabilityService.updateById(supportCapability);
+
+        supportCapability.setId(id);
+
+        SupportCapability origin = supportCapabilityService.getById(id);
+        if (null == origin) {
+            supportCapabilityService.save(supportCapability);
+        } else {
+            supportCapabilityService.updateById(supportCapability);
+        }
+
         return ResponseBean.success(supportCapability);
     }
     

src/main/java/com/yunzhi/inte/entity/CooperationPerson.java

@@ -0,0 +1,60 @@
+package com.yunzhi.inte.entity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+ /**
+ * 保障机构人员;
+ * @author : http://www.chiner.pro
+ * @date : 2022-10-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "保障机构人员",description = "")
+@TableName("cooperation_person")
+public class CooperationPerson implements Serializable,Cloneable{
+    /** 人员ID */
+    @ApiModelProperty(name = "人员ID",notes = "")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id ;
+    /** 机构ID */
+    @ApiModelProperty(name = "机构ID",notes = "")
+    private Integer orgId ;
+    /** 姓名 */
+    @ApiModelProperty(name = "姓名",notes = "")
+    private String name ;
+    /** 身份证号 */
+    @ApiModelProperty(name = "身份证号",notes = "")
+    private String idNo ;
+    /** 性别;1男2女9未知 */
+    @ApiModelProperty(name = "性别",notes = "1男2女9未知")
+    private Integer sex ;
+    /** 民族 */
+    @ApiModelProperty(name = "民族",notes = "")
+    private String ethnic ;
+    /** 政治面貌 */
+    @ApiModelProperty(name = "政治面貌",notes = "")
+    private String politicalStatus ;
+    /** 联系电话 */
+    @ApiModelProperty(name = "联系电话",notes = "")
+    private String phone ;
+    /** 是否健康证 */
+    @ApiModelProperty(name = "是否健康证",notes = "")
+    private Integer isHealthCertificate ;
+    /** 家庭住址 */
+    @ApiModelProperty(name = "家庭住址",notes = "")
+    private String homeAddr ;
+    /** 状态 */
+    @ApiModelProperty(name = "状态",notes = "")
+    private Integer status ;
+
+}

src/main/java/com/yunzhi/inte/entity/Dishes.java

@@ -60,4 +60,8 @@ public class Dishes implements Serializable,Cloneable{
     @TableField(exist = false)
     @ApiModelProperty(name = "菜肴列表", notes = "")
     private List<Integer> ingredientsIdList;
+
+    @TableField(exist = false)
+    @ApiModelProperty(name = "菜肴类型", notes = "1主食,2菜肴")
+    private Integer dishKind;
 }

src/main/java/com/yunzhi/inte/entity/PackageDetail.java

@@ -32,5 +32,8 @@ public class PackageDetail implements Serializable,Cloneable{
     /** 菜肴ID */
     @ApiModelProperty(name = "菜肴ID",notes = "")
     private Integer dishId ;
+    /** 菜肴类型 */
+    @ApiModelProperty(name = "菜肴类型",notes = "1主食,2菜肴")
+    private Integer dishKind ;
 
 }

src/main/java/com/yunzhi/inte/mapper/CooperationPersonMapper.java

@@ -0,0 +1,16 @@
+package com.yunzhi.inte.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import com.yunzhi.inte.entity.CooperationPerson;
+
+ /**
+ * 保障机构人员;(cooperation_person)表数据库访问层
+ * @author : http://njyunzhi.com
+ * @date : 2022-10-24
+ */
+@Mapper
+public interface CooperationPersonMapper  extends BaseMapper<CooperationPerson>{
+    
+}

src/main/java/com/yunzhi/inte/service/CooperationPersonService.java

@@ -0,0 +1,13 @@
+package com.yunzhi.inte.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yunzhi.inte.entity.CooperationPerson;
+
+ /**
+ * 保障机构人员;(cooperation_person)表服务接口
+ * @author : http://njyunzhi.com
+ * @date : 2022-10-24
+ */
+public interface CooperationPersonService extends IBaseService<CooperationPerson> {
+    
+}

src/main/java/com/yunzhi/inte/service/impl/CooperationPersonServiceImpl.java

@@ -0,0 +1,16 @@
+package com.yunzhi.inte.service.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.yunzhi.inte.entity.CooperationPerson;
+import com.yunzhi.inte.mapper.CooperationPersonMapper;
+import com.yunzhi.inte.service.CooperationPersonService;
+ /**
+ * 保障机构人员;(cooperation_person)表服务实现类
+ * @author : http://www.chiner.pro
+ * @date : 2022-10-24
+ */
+@Service
+public class CooperationPersonServiceImpl extends BaseServiceImpl<CooperationPersonMapper, CooperationPerson> implements CooperationPersonService {
+    
+}

src/main/resources/mapper/CooperationPersonMapper.xml

@@ -0,0 +1,6 @@
+<?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.yunzhi.inte.mapper.CooperationPersonMapper">
+    
+</mapper>

src/main/resources/mapper/PackageDetailMapper.xml

@@ -5,13 +5,14 @@
 
     <select id="getPageByPackage" resultType="com.yunzhi.inte.entity.Dishes">
         SELECT
-            t.*
+            t.*,
+            s.dish_kind
         FROM
             dishes t
                 INNER JOIN package_detail s ON t.id = s.dish_id
         WHERE
             s.package_id = #{packageId}
         ORDER BY
-            t.id
+            s.dish_kind ASC, s.id ASC
     </select>
 </mapper>