1.代码生成器生成baseEnyrt错误

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

@@ -18,8 +18,6 @@ public class DutyShiftDto  extends BaseDto {
 
    private static final long serialVersionUID = 1L;
 
-
-
     @ApiModelProperty(value = "班次名称")
     private String name;
 

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

@@ -2,22 +2,20 @@ package com.yeejoin.amos.boot.module.common.api.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import java.util.Date;
 import java.util.Objects;
 
 /**
-* 值班人员日期关联关系表
-*
-* @author system_generator
-* @date 2021-07-06
-*/
+ * 值班人员日期关联关系表
+ *
+ * @author system_generator
+ * @date 2021-07-06
+ */
 @Data
-@EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @TableName("cb_duty_person_shift")
 public class DutyPersonShift extends BaseEntity {
@@ -26,30 +24,30 @@ public class DutyPersonShift extends BaseEntity {
 
 
     /**
-	  * 值班日期
+     * 值班日期
      */
-	@TableField("duty_date")
+    @TableField("duty_date")
     private Date dutyDate;
     /**
-	  * 值班班次id
+     * 值班班次id
      */
-	@TableField("shift_id")
+    @TableField("shift_id")
     private Long shiftId;
     /**
-	  * 实例id
+     * 实例id
      */
-	@TableField("instance_id")
+    @TableField("instance_id")
     private Long instanceId;
     /**
-	  * 更新人员
+     * 更新人员
      */
-	@TableField("rec_user_name")
+    @TableField("rec_user_name")
     private String recUserName;
 
     /**
      * 应用标识（数据隔离使用）
      */
-	private String appKey;
+    private String appKey;
 
     @Override
     public boolean equals(Object o) {

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

@@ -2,7 +2,7 @@ package com.yeejoin.amos.boot.module.common.api.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;

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

@@ -4,8 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
-
-import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;

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

@@ -2,7 +2,7 @@ package com.yeejoin.amos.boot.module.common.api.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;

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

@@ -4,9 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
-
-
-import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;

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

@@ -4,15 +4,15 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Sequence;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.module.common.api.dto.DutyPersonShiftDto;
 import com.yeejoin.amos.boot.module.common.api.entity.DutyPersonShift;
+import com.yeejoin.amos.boot.module.common.api.entity.DutyShift;
 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.enums.DutyViewTypeEnum;
-import com.yeejoin.amos.boot.module.common.api.service.IDutyPersonShiftService;
 import com.yeejoin.amos.boot.module.common.biz.service.IDutyCommonService;
-import com.yeejoin.amos.boot.module.common.biz.service.IDutyPersonService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -47,6 +47,9 @@ public class DutyCommonServiceImpl implements IDutyCommonService {
     @Autowired
     HttpServletRequest request;
 
+    @Autowired
+    DutyShiftServiceImpl dutyShiftService;
+
     /**
      * 每天单个班次执勤人数全部小于等于3人
      */
@@ -75,10 +78,17 @@ public class DutyCommonServiceImpl implements IDutyCommonService {
 
     private void fillDutyShiftData(String beginDate, String endDate, Map<String, Object> m) throws ParseException {
         String instanceId = m.get("instanceId").toString();
-        List<DutyPersonShift> personShiftList = dutyPersonShiftService.list(new LambdaQueryWrapper<DutyPersonShift>()
+        List<DutyShift> dutyShifts = dutyShiftService.list(new LambdaQueryWrapper<DutyShift>().eq(BaseEntity::getIsDelete, false).eq(DutyShift::getAppKey, RequestContext.getAppKey()));
+        Map<Long, String> keyNameMap = dutyShifts.stream().collect(Collectors.toMap(BaseEntity::getSequenceNbr, DutyShift::getName));
+        List<DutyPersonShiftDto> personShiftList = dutyPersonShiftService.list(new LambdaQueryWrapper<DutyPersonShift>()
                 .eq(DutyPersonShift::getInstanceId, instanceId)
                 .ge(beginDate != null, DutyPersonShift::getDutyDate, beginDate)
-                .le(endDate != null, DutyPersonShift::getDutyDate, endDate));
+                .le(endDate != null, DutyPersonShift::getDutyDate, endDate)).stream().map(e -> {
+            DutyPersonShiftDto dto = new DutyPersonShiftDto();
+            Bean.copyExistPropertis(e, dto);
+            dto.setShiftName(keyNameMap.get(e.getSequenceNbr()));
+            return dto;
+        }).collect(Collectors.toList());
         m.put("dutyShift", personShiftList);
     }
 
@@ -249,9 +259,9 @@ public class DutyCommonServiceImpl implements IDutyCommonService {
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public Boolean deleteDutyData(Long instanceId){
-        dynamicFormInstanceService.remove(new LambdaQueryWrapper<DynamicFormInstance>().eq(DynamicFormInstance::getInstanceId,instanceId));
-        dutyPersonShiftService.remove(new LambdaQueryWrapper<DutyPersonShift>().eq(DutyPersonShift::getInstanceId,instanceId));
+    public Boolean deleteDutyData(Long instanceId) {
+        dynamicFormInstanceService.remove(new LambdaQueryWrapper<DynamicFormInstance>().eq(DynamicFormInstance::getInstanceId, instanceId));
+        dutyPersonShiftService.remove(new LambdaQueryWrapper<DutyPersonShift>().eq(DutyPersonShift::getInstanceId, instanceId));
         return true;
     }
 }

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

@@ -25,6 +25,8 @@ public class DutyPersonShiftServiceImpl extends BaseService<DutyPersonShiftDto,
         return this.queryForPage(page, null, false);
     }
 
+
+
     /**
      * 列表查询 示例
      */

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

 package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.common.api.dto.DynamicFormGroupDto;
 import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormGroup;
 import com.yeejoin.amos.boot.module.common.api.mapper.DynamicFormGroupMapper;
 import com.yeejoin.amos.boot.module.common.api.service.IDynamicFormGroupService;
-import com.yeejoin.amos.boot.module.common.api.dto.DynamicFormGroupDto;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
 import java.util.List;
+
 /**
-* 动态表单分组表(支持树形)服务实现类
-*
-* @author system_generator
-* @date 2021-07-06
-*/
+ * 动态表单分组表(支持树形)服务实现类
+ *
+ * @author system_generator
+ * @date 2021-07-06
+ */
 @Service
-public class DynamicFormGroupServiceImpl extends BaseService<DynamicFormGroupDto,DynamicFormGroup,DynamicFormGroupMapper> implements IDynamicFormGroupService {
-        /**
-                            * 分页查询
-         */
-        public Page<DynamicFormGroupDto> queryForDynamicFormGroupPage(Page<DynamicFormGroupDto> page)   {
-                return this.queryForPage(page, null, false);
-        }
+public class DynamicFormGroupServiceImpl extends BaseService<DynamicFormGroupDto, DynamicFormGroup, DynamicFormGroupMapper> implements IDynamicFormGroupService {
+    /**
+     * 分页查询
+     */
+    public Page<DynamicFormGroupDto> queryForDynamicFormGroupPage(Page<DynamicFormGroupDto> page) {
+        return this.queryForPage(page, null, false);
+    }
 
-        /**
-                            * 列表查询 示例
-         */
-        public List<DynamicFormGroupDto> queryForDynamicFormGroupList()   {
-                return this.queryForList("" , false);
-        }
+    /**
+     * 列表查询 示例
+     */
+    public List<DynamicFormGroupDto> queryForDynamicFormGroupList() {
+        return this.queryForList("", false);
+    }
 }