1.值班接口

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/config/MyBatisPlusConfig.java

 package com.yeejoin.amos.boot.biz.config;
 
 import com.baomidou.mybatisplus.core.config.GlobalConfig;
+import com.baomidou.mybatisplus.core.toolkit.Sequence;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+
 /**
  * 
  * 
@@ -19,4 +21,9 @@ public class MyBatisPlusConfig {
         globalConfig.setMetaObjectHandler(new MetaHandler());
         return globalConfig;
     }
+
+    @Bean
+    public Sequence sequence(){
+        return new Sequence();
+    }
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/DutyCarDto.java

+package com.yeejoin.amos.boot.module.common.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+* 值班班次
+*
+* @author system_generator
+* @date 2021-07-06
+*/
+@Data
+@ApiModel(value="DutyCarDto", description="值班车辆")
+public class DutyCarDto implements Serializable {
+
+   private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "用户id")
+    private String userId;
+
+    @ApiModelProperty(value = "用户名称")
+    private String userName;
+
+    @ApiModelProperty(value = "车辆id")
+    private String carId;
+
+    @ApiModelProperty(value = "车辆名称")
+    private String carName;
+
+    @ApiModelProperty(value = "消防队伍id")
+    private String teamId;
+
+    @ApiModelProperty(value = "消防队伍名称")
+    private String teamName;
+
+    @ApiModelProperty(value = "岗位id")
+    private String postType;
+
+    @ApiModelProperty(value = "岗位名称")
+    private String postTypeName;
+
+    @ApiModelProperty(value = "值班信息")
+    private List<DutyPersonShiftDto> dutyShift = new ArrayList<>();
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/DutyPersonDto.java

+package com.yeejoin.amos.boot.module.common.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 值班班次
+ *
+ * @author system_generator
+ * @date 2021-07-06
+ */
+@Data
+@ApiModel(value = "DutyPersonDto", description = "值班人")
+public class DutyPersonDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "用户id")
+    private String userId;
+
+    @ApiModelProperty(value = "用户名称")
+    private String userName;
+
+    @ApiModelProperty(value = "部门id")
+    private String deptId;
+
+    @ApiModelProperty(value = "部门名称")
+    private String deptName;
+
+    @ApiModelProperty(value = "岗位id")
+    private String postType;
+
+    @ApiModelProperty(value = "岗位名称")
+    private String postTypeName;
+
+    @ApiModelProperty(value = "值班信息")
+    private List<DutyPersonShiftDto> dutyShift;
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/DutyPersonShiftDto.java

@@ -21,8 +21,6 @@ public class DutyPersonShiftDto  extends BaseDto {
 
    private static final long serialVersionUID = 1L;
 
-
-
     @ApiModelProperty(value = "值班日期")
     private Date dutyDate;
 
@@ -35,4 +33,7 @@ public class DutyPersonShiftDto  extends BaseDto {
     @ApiModelProperty(value = "更新人员")
     private String recUserName;
 
+   @ApiModelProperty(value = "班次名称")
+   private String shiftName;
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/DutyPersonShift.java

@@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import java.util.Date;
+import java.util.Objects;
 
 /**
 * 值班人员日期关联关系表
@@ -44,4 +45,25 @@ public class DutyPersonShift extends BaseEntity {
      */
 	@TableField("rec_user_name")
     private String recUserName;
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof DutyPersonShift)) {
+            return false;
+        }
+        if (!super.equals(o)) {
+            return false;
+        }
+        DutyPersonShift that = (DutyPersonShift) o;
+        return Objects.equals(dutyDate, that.dutyDate) &&
+                Objects.equals(instanceId, that.instanceId);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(super.hashCode(), dutyDate, instanceId);
+    }
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/DynamicFormColumn.java

@@ -79,8 +79,10 @@ public class DynamicFormColumn extends BaseEntity {
      */
 	@TableField("remark")
     private String remark;
-	
-    //新加排序字段
+
+    /**
+     * 排序字段
+     */
 	@TableField("sort")
     private int sort;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/DynamicFormInstanceMapper.java

@@ -4,8 +4,10 @@ import com.yeejoin.amos.boot.module.common.api.dto.DynamicFormInstanceDto;
 import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormInstance;
 
 import java.util.List;
+import java.util.Map;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
 * 动态表单实例表 Mapper 接口
@@ -17,4 +19,13 @@ public interface DynamicFormInstanceMapper extends BaseMapper<DynamicFormInstanc
 
 	public List<DynamicFormInstanceDto> selectListByCalledId(Long id);
 
+    /**
+     * 列转行查询
+     *
+     * @param appKey 应用标识
+     * @param fieldCodes 列
+     * @param groupCode 分组code
+     * @return List<Map>
+     */
+    List<Map<String, Object>> listAll(@Param("appKey") String appKey, @Param("fieldCodes") Map<String, Object> fieldCodes, @Param("groupCode") String groupCode);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IDynamicFormInstanceService.java

 package com.yeejoin.amos.boot.module.common.api.service;
 
 
+import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormInstance;
+
+import java.util.List;
+import java.util.Map;
+
 /**
 * 动态表单实例表接口类
 *
@@ -8,5 +13,4 @@ package com.yeejoin.amos.boot.module.common.api.service;
 * @date 2021-07-06
 */
 public interface IDynamicFormInstanceService {
-
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/DynamicFormInstanceMapper.xml

@@ -22,4 +22,23 @@
 		LEFT JOIN cb_dynamic_form_column f ON f.sequence_nbr = v.form_column_id
 		WHERE v.instance_id=#{id}
 	</select>
+	<select id="listAll" resultType="java.util.Map">
+		select
+		d.*
+		from
+		(
+		select
+		i.INSTANCE_ID instanceId,
+		i.GROUP_CODE groupCode,
+		<foreach collection="fieldCodes" item="value" index="key" separator=",">
+			MAX(CASE WHEN i.FIELD_CODE = #{key} THEN i.FIELD_VALUE END) as ${key}
+		</foreach>
+		from
+		cb_dynamic_form_instance i
+		where i.GROUP_CODE = #{groupCode}
+		and APP_KEY = #{appKey}
+		GROUP by
+		i.INSTANCE_ID)d
+		order by instanceId desc
+	</select>
 </mapper>

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/DutyCarController.java

+package com.yeejoin.amos.boot.module.common.biz.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.common.api.dto.DutyCarDto;
+import com.yeejoin.amos.boot.module.common.biz.service.IDutyCarService;
+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 org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import java.text.ParseException;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 值班班次
+ *
+ * @author system_generator
+ * @date 2021-07-06
+ */
+@RestController
+@Api(tags = "值班车辆接口Api")
+@RequestMapping(value = "/common/duty-car")
+public class DutyCarController extends BaseController {
+
+    @Autowired
+    IDutyCarService iDutyCarService;
+
+
+    /**
+     * 值班列表视图--分页
+     *
+     * @return ResponseModel
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/page-list")
+    @ApiOperation(httpMethod = "GET", value = "值班列表视图", notes = "值班列表视图")
+    public ResponseModel<IPage<Map<String, Object>>> pageList(
+            @ApiParam(value = "当前页", required = true) @RequestParam(value = "current") int current,
+            @ApiParam(value = "页面大小", required = true) @RequestParam(value = "size") int size) {
+        return ResponseHelper.buildResponse(iDutyCarService.pageList(current, size));
+    }
+
+    /**
+     * 值班列表视图--不分页
+     *
+     * @return ResponseModel
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/list")
+    @ApiOperation(httpMethod = "GET", value = "值班列表视图", notes = "值班列表视图")
+    public ResponseModel list(@ApiParam(value = "开始日期", required = true) @RequestParam Date beginDate,
+                                         @ApiParam(value = "结束日期", required = true) @RequestParam Date endDate) throws ParseException {
+        return ResponseHelper.buildResponse(iDutyCarService.list(beginDate, endDate));
+    }
+
+
+    /**
+     * 值班月视图
+     *
+     * @return ResponseModel
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @GetMapping("/statistics-day")
+    @ApiOperation(httpMethod = "GET", value = "值班月视图", notes = "值班月视图")
+    public ResponseModel<List<Map<String, Object>>> dutyDetail(
+            @ApiParam(value = "开始日期", required = true) @RequestParam Date beginDate,
+            @ApiParam(value = "结束日期", required = true) @RequestParam Date endDate
+    ) {
+        return ResponseHelper.buildResponse(iDutyCarService.dutyDetail(beginDate, endDate));
+    }
+
+    /**
+     * 调班
+     *
+     * @return ResponseModel
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+	@PostMapping("/duty-adjust")
+	@ApiOperation(httpMethod = "POST", value = "调班保存", notes = "调班保存")
+	public ResponseModel dutyAdjustSave(@RequestBody DutyCarDto dutyCarDto) {
+		return ResponseHelper.buildResponse(iDutyCarService.save(dutyCarDto));
+	}
+
+    /**
+     *  调班
+     * @param instanceId 实例id
+     * @param dutyCarDto 业务对象
+     * @return DutyCarDto
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+	@PutMapping("/duty-adjust")
+	@ApiOperation(httpMethod = "POST", value = "调班更新", notes = "调班更新")
+	public ResponseModel dutyAdjustUpdate(
+			@RequestParam Long instanceId,
+			@RequestBody DutyCarDto dutyCarDto) {
+		return ResponseHelper.buildResponse(iDutyCarService.update(instanceId,dutyCarDto));
+	}
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/DutyPersonController.java

+package com.yeejoin.amos.boot.module.common.biz.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.common.api.dto.DutyCarDto;
+import com.yeejoin.amos.boot.module.common.api.dto.DutyPersonDto;
+import com.yeejoin.amos.boot.module.common.biz.service.IDutyPersonService;
+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 org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 值班班次
+ *
+ * @author system_generator
+ * @date 2021-07-06
+ */
+@RestController
+@Api(tags = "值班人员接口Api")
+@RequestMapping(value = "/common/duty-person")
+public class DutyPersonController extends BaseController {
+
+    @Autowired
+    IDutyPersonService iDutyPersonService;
+
+
+    /**
+     * 值班列表视图--分页
+     *
+     * @return ResponseModel
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/page-list")
+    @ApiOperation(httpMethod = "GET", value = "值班列表视图", notes = "值班列表视图")
+    public ResponseModel<IPage<Map<String, Object>>> pageList(
+            @ApiParam(value = "当前页", required = true) @RequestParam(value = "current") int current,
+            @ApiParam(value = "页面大小", required = true) @RequestParam(value = "size") int size) {
+        return ResponseHelper.buildResponse(iDutyPersonService.pageList(current, size));
+    }
+
+    /**
+     * 值班列表视图--不分页
+     *
+     * @return ResponseModel
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/list")
+    @ApiOperation(httpMethod = "GET", value = "值班列表视图", notes = "值班列表视图")
+    public ResponseModel<List<Map>> list(@ApiParam(value = "开始日期", required = true) @RequestParam Date beginDate,
+                                         @ApiParam(value = "结束日期", required = true) @RequestParam Date endDate) {
+        return ResponseHelper.buildResponse(iDutyPersonService.list(beginDate, endDate));
+    }
+
+
+    /**
+     * 值班月视图
+     *
+     * @return ResponseModel
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @GetMapping("/duty-detail")
+    @ApiOperation(httpMethod = "GET", value = "值班月视图", notes = "值班月视图")
+    public ResponseModel<List<Map<String, Object>>> dutyDetail(
+            @ApiParam(value = "开始日期", required = true) @RequestParam Date beginDate,
+            @ApiParam(value = "结束日期", required = true) @RequestParam Date endDate
+    ) {
+        return ResponseHelper.buildResponse(iDutyPersonService.dutyDetail(beginDate, endDate));
+    }
+
+    /**
+     * 调班
+     *
+     * @return ResponseModel
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @PostMapping("/duty-adjust")
+    @ApiOperation(httpMethod = "POST", value = "调班保存", notes = "调班保存")
+    public ResponseModel dutyAdjust(@RequestBody DutyPersonDto dutyPersonDto) {
+        return ResponseHelper.buildResponse(iDutyPersonService.save(dutyPersonDto));
+    }
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/IDutyCarService.java

+package com.yeejoin.amos.boot.module.common.biz.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yeejoin.amos.boot.module.common.api.dto.DutyCarDto;
+
+import java.text.ParseException;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author DELL
+ */
+public interface IDutyCarService {
+    /**
+     * 分页查询
+     *
+     * @param current 当前页
+     * @param size    页大小
+     * @return ResponseModel
+     */
+    IPage<Map<String, Object>> pageList(int current, int size);
+
+    /**
+     * 值班明细
+     *
+     * @param beginDate 开始日期
+     * @param endDate   结束日期
+     * @return ResponseModel
+     */
+    List<Map<String, Object>> dutyDetail(Date beginDate, Date endDate);
+
+    /**
+     * 不分页查询
+     *
+     * @param dutyType 表单类型
+     * @return ResponseModel
+     */
+    List<Map> list(String dutyType);
+
+    /**
+     * 不分页查询
+     *
+     * @param beginDate 开始日期
+     * @param endDate   结束日期
+     * @return ResponseModel
+     */
+    List<Map<String, Object>> list(Date beginDate, Date endDate) throws ParseException;
+
+    /**
+     * 值班信息保存
+     * @param dutyCarDto 对象
+     * @return List<DutyCarDto>
+     */
+    DutyCarDto save(DutyCarDto dutyCarDto);
+
+    /**
+     * 更新
+     * @param instanceId 实例id
+     * @param dutyCarDto 业务对象
+     * @return List<DutyCarDto>
+     */
+    DutyCarDto update(Long instanceId, DutyCarDto dutyCarDto);
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/IDutyPersonService.java

+package com.yeejoin.amos.boot.module.common.biz.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yeejoin.amos.boot.module.common.api.dto.DutyPersonDto;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author DELL
+ */
+public interface IDutyPersonService {
+    /**
+     * 分页查询
+     *
+     * @param current 当前页
+     * @param size    页大小
+     * @return ResponseModel
+     */
+    IPage<Map<String, Object>> pageList(int current, int size);
+
+    /**
+     * 值班明细
+     *
+     * @param beginDate 开始日期
+     * @param endDate   结束日期
+     * @return ResponseModel
+     */
+    List<Map<String, Object>> dutyDetail(Date beginDate, Date endDate);
+
+    /**
+     * 不分页查询
+     *
+     * @param beginDate 开始日期
+     * @param endDate   结束日期
+     * @return ResponseModel
+     */
+    List<Map> list(Date beginDate, Date endDate);
+
+    /**
+     * 保存
+     *
+     * @param dutyCarDto 业务对象
+     * @return List<DutyPersonDto>
+     */
+    List<DutyPersonDto> save(DutyPersonDto dutyCarDto);
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/DutyCarServiceImpl.java

+package com.yeejoin.amos.boot.module.common.biz.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Sequence;
+import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
+import com.yeejoin.amos.boot.module.common.api.dto.DutyCarDto;
+import com.yeejoin.amos.boot.module.common.api.entity.DutyPersonShift;
+import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormColumn;
+import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormInstance;
+import com.yeejoin.amos.boot.module.common.api.mapper.DynamicFormInstanceMapper;
+import com.yeejoin.amos.boot.module.common.biz.service.IDutyCarService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
+import org.typroject.tyboot.core.foundation.utils.Bean;
+
+import java.text.ParseException;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * @author DELL
+ */
+@Service
+public class DutyCarServiceImpl implements IDutyCarService {
+
+    @Autowired
+    DynamicFormColumnServiceImpl dynamicFormColumnService;
+
+    @Autowired
+    DynamicFormInstanceServiceImpl dynamicFormInstanceService;
+
+    @Autowired
+    DutyPersonShiftServiceImpl dutyPersonShiftService;
+
+    @Autowired
+    Sequence sequence;
+
+    @Autowired
+    DynamicFormInstanceMapper dynamicFormInstanceMapper;
+
+    private final String GROUP_CODE = "dutyCar";
+
+
+    @Override
+    public IPage<Map<String, Object>> pageList(int current, int size) {
+        return null;
+    }
+
+    @Override
+    public List<Map<String, Object>> dutyDetail(Date beginDate, Date endDate) {
+        return null;
+    }
+
+    @Override
+    public List<Map> list(String dutyType) {
+        return null;
+    }
+
+    @Override
+    public List<Map<String, Object>> list(Date beginDate, Date endDate) throws ParseException {
+        //1.已column为准 进行返回
+        List<DynamicFormColumn> columns = dynamicFormColumnService.list(new LambdaQueryWrapper<DynamicFormColumn>().eq(DynamicFormColumn::getGroupCode, GROUP_CODE));
+        Map<String, Object> fieldCodes = Bean.listToMap(columns, "fieldCode", "queryStrategy", DynamicFormColumn.class);
+        List<Map<String, Object>> list = dynamicFormInstanceMapper.listAll(RequestContext.getAppKey(), fieldCodes, GROUP_CODE);
+        //2.组织值班数据
+        for (Map<String, Object> map : list) {
+            String instanceId = map.get("instanceId").toString();
+            List<DutyPersonShift> personShiftList = dutyPersonShiftService.list(new LambdaQueryWrapper<DutyPersonShift>()
+                    .eq(DutyPersonShift::getInstanceId, instanceId)
+                    .ge(beginDate != null, DutyPersonShift::getDutyDate, DateUtils.dateFormat(beginDate, DateUtils.DATE_PATTERN))
+                    .le(endDate != null, DutyPersonShift::getDutyDate, DateUtils.dateFormat(endDate, DateUtils.DATE_PATTERN)));
+            map.put("dutyShift", personShiftList);
+        }
+        return list;
+    }
+
+    @Override
+    public DutyCarDto save(DutyCarDto dutyCarDto) {
+        //1.保存行数据
+        List<DynamicFormColumn> columns = dynamicFormColumnService.list(new LambdaQueryWrapper<DynamicFormColumn>().eq(DynamicFormColumn::getGroupCode, GROUP_CODE));
+        Map<String, Object> map = Bean.BeantoMap(dutyCarDto);
+        Long instanceId = sequence.nextId();
+        List<DynamicFormInstance> instances = columns.stream().map(column -> {
+            DynamicFormInstance instance = new DynamicFormInstance();
+            buildFormInstanceData(instanceId, map, column, instance);
+            return instance;
+        }).collect(Collectors.toList());
+        if (!instances.isEmpty()) {
+            dynamicFormInstanceService.saveBatch(instances);
+        }
+        //2.保存值班信息
+        insertPersonShift(instanceId, dutyCarDto);
+        //3.返回保存后的数据
+        return dutyCarDto;
+    }
+
+    @Override
+    public DutyCarDto update(Long instanceId, DutyCarDto dutyCarDto) {
+        //1.查询已有数据
+        List<DynamicFormInstance> instances = dynamicFormInstanceService.list(new LambdaQueryWrapper<DynamicFormInstance>().eq(DynamicFormInstance::getInstanceId, instanceId));
+        //2.list 转 map
+        Map<Object, DynamicFormInstance> instanceMap = Bean.listToMap(instances, "fieldCode", DynamicFormInstance.class);
+        //3.查询列数据，已列为主
+        List<DynamicFormColumn> columns = dynamicFormColumnService.list(new LambdaQueryWrapper<DynamicFormColumn>().eq(DynamicFormColumn::getGroupCode, GROUP_CODE));
+        //页面数据转Map
+        Map<String, Object> map = Bean.BeantoMap(dutyCarDto);
+        //4.已列为主 填充动态表单数据
+        for (DynamicFormColumn column : columns) {
+            DynamicFormInstance formInstance = instanceMap.get(column.getFieldCode());
+            if (!ObjectUtils.isEmpty(formInstance)) {
+                //有的更新
+                formInstance.setFieldValue(map.get(column.getFieldCode()) != null ? map.get(column.getFieldCode()).toString() : "");
+            } else {
+                //没有的新增
+                formInstance = new DynamicFormInstance();
+                buildFormInstanceData(instanceId, map, column, formInstance);
+            }
+        }
+        //5.更新值班信息人日期数据
+        insertPersonShift(instanceId, dutyCarDto);
+        return dutyCarDto;
+    }
+
+    private void insertPersonShift(Long instanceId, DutyCarDto dutyCarDto) {
+        Set<DutyPersonShift> personShiftList = dutyCarDto.getDutyShift().stream().map(dto -> {
+            DutyPersonShift dutyPersonShift = new DutyPersonShift();
+            dto.setInstanceId(instanceId);
+            Bean.copyExistPropertis(dto, dutyPersonShift);
+            return dutyPersonShift;
+        }).collect(Collectors.toSet());
+        if (!personShiftList.isEmpty()) {
+            dutyPersonShiftService.saveOrUpdateBatch(personShiftList);
+        }
+    }
+
+    private void buildFormInstanceData(Long instanceId, Map<String, Object> map, DynamicFormColumn column, DynamicFormInstance formInstance) {
+        Bean.copyExistPropertis(column, formInstance);
+        formInstance.setAppKey(RequestContext.getAppKey());
+        formInstance.setInstanceId(instanceId);
+        formInstance.setSequenceNbr(sequence.nextId());
+        formInstance.setFormColumnId(column.getSequenceNbr());
+        formInstance.setFieldValue(map.get(column.getFieldCode()) != null ? map.get(column.getFieldCode()).toString() : "");
+    }
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/DutyPersonServiceImpl.java

+package com.yeejoin.amos.boot.module.common.biz.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yeejoin.amos.boot.module.common.api.dto.DutyPersonDto;
+import com.yeejoin.amos.boot.module.common.biz.service.IDutyPersonService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author DELL
+ */
+@Service
+public class DutyPersonServiceImpl implements IDutyPersonService {
+    
+    @Override
+    public IPage<Map<String, Object>> pageList(int current, int size) {
+        return null;
+    }
+
+    @Override
+    public List<Map<String, Object>> dutyDetail(Date beginDate, Date endDate) {
+        return null;
+    }
+
+    @Override
+    public List<Map> list(Date beginDate, Date endDate) {
+        return null;
+    }
+
+    @Override
+    public List<DutyPersonDto> save(DutyPersonDto dutyCarDto) {
+        return null;
+    }
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/DynamicFormInstanceServiceImpl.java

 package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
-
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.common.api.dto.DynamicFormInstanceDto;
 import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormInstance;
 import com.yeejoin.amos.boot.module.common.api.mapper.DynamicFormInstanceMapper;
 import com.yeejoin.amos.boot.module.common.api.service.IDynamicFormInstanceService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import java.util.List;
+import java.util.Map;
+
 /**
-* 动态表单实例表服务实现类
-*
-* @author system_generator
-* @date 2021-07-06
-*/
+ * 动态表单实例表服务实现类
+ *
+ * @author system_generator
+ * @date 2021-07-06
+ */
 @Service
-public class DynamicFormInstanceServiceImpl extends BaseService<DynamicFormInstanceDto,DynamicFormInstance,DynamicFormInstanceMapper> implements IDynamicFormInstanceService {
-        
-	@Autowired
-	private DynamicFormInstanceMapper dynamicFormInstanceMapper;
-	/**
-                            * 分页查询
-         */
-        public Page<DynamicFormInstanceDto> queryForDynamicFormInstancePage(Page<DynamicFormInstanceDto> page)   {
-                return this.queryForPage(page, null, false);
-        }
-
-        /**
-                            * 列表查询 示例
-         */
-        public List<DynamicFormInstanceDto> queryForDynamicFormInstanceList()   {
-                return this.queryForList("" , false);
-        }
-        
-    	
-    	
-    	public List<DynamicFormInstanceDto> queryByCalledId(Long instanceId) {
-    		return this.queryForList(null, false, instanceId);
-    	}
-
-    	public List<DynamicFormInstanceDto> listByCalledId(Long instanceId) {
-    		return dynamicFormInstanceMapper.selectListByCalledId(instanceId);
-    	}
+public class DynamicFormInstanceServiceImpl extends BaseService<DynamicFormInstanceDto, DynamicFormInstance, DynamicFormInstanceMapper> implements IDynamicFormInstanceService {
+
+    @Autowired
+    private DynamicFormInstanceMapper dynamicFormInstanceMapper;
+
+    /**
+     * 分页查询
+     */
+    public Page<DynamicFormInstanceDto> queryForDynamicFormInstancePage(Page<DynamicFormInstanceDto> page) {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<DynamicFormInstanceDto> queryForDynamicFormInstanceList() {
+        return this.queryForList("", false);
+    }
+
+
+    public List<DynamicFormInstanceDto> queryByCalledId(Long instanceId) {
+        return this.queryForList(null, false, instanceId);
+    }
+
+    public List<DynamicFormInstanceDto> listByCalledId(Long instanceId) {
+        return dynamicFormInstanceMapper.selectListByCalledId(instanceId);
+    }
+
 }

pom.xml

@@ -45,7 +45,7 @@
 		<dependency>
 			<groupId>com.baomidou</groupId>
 			<artifactId>mybatis-plus-boot-starter</artifactId>
-			<version>3.1.2</version>
+			<version>3.2.0</version>
 		</dependency>
 		<!-- <dependency>
 			<groupId>com.baomidou</groupId>