1生成代码模板修改，

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/entity/BaseEntity.java

@@ -17,21 +17,20 @@ import java.util.Date;
 @Data
 public class BaseEntity implements Serializable{
 	
-	/**
-	 * 
-	 */
 	private static final long serialVersionUID = 1L;
 
-		@TableId(value = "sequence_nbr" , type = IdType.ID_WORKER)
-	    protected Long sequenceNbr;
+	@TableId(value = "sequence_nbr" , type = IdType.ID_WORKER)
+	protected Long sequenceNbr;
+
+	@TableField(value = "rec_date", fill = FieldFill.INSERT_UPDATE)
+	protected Date recDate;
 
-	    @TableField(value = "rec_date",fill=FieldFill.INSERT_UPDATE )
-	    protected Date recDate;
-	    @TableField(value = "rec_user_id",fill=FieldFill.INSERT_UPDATE )
-	    protected String recUserId;
-	    /**
-	     * 是否删除
-	     */
-	    @TableField(value = "is_delete")
-	    private Boolean isDelete;
+	@TableField(value = "rec_user_id", fill = FieldFill.INSERT_UPDATE)
+	protected String recUserId;
+
+	/**
+	 * 是否删除
+	 */
+	@TableField(value = "is_delete")
+	private Boolean isDelete;
 }

amos-boot-biz-common/src/main/resources/template/bean.java.ftl

@@ -2,10 +2,12 @@ package ${package.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;
+
 /**
 * ${table.comment!}
 *
@@ -20,11 +22,10 @@ public class ${entity} extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
 
-
 <#-- ----------  BEGIN 字段循环遍历  ---------->
 <#list table.fields as field>
     /**
-	  * ${field.comment}
+     * ${field.comment}
      */
 	@TableField("${field.name}")
     private ${field.propertyType} ${field.propertyName};

amos-boot-biz-common/src/main/resources/template/controller.java.ftl

@@ -24,11 +24,11 @@ import org.typroject.tyboot.core.foundation.enumeration.UserType;
 
 
 /**
-* ${table.comment!}
-*
-* @author ${author}
-* @date ${date}
-*/
+ * ${table.comment!}
+ *
+ * @author ${author}
+ * @date ${date}
+ */
 <#if restControllerStyle>
 @RestController
 @Api(tags = "${table.comment}Api")
@@ -49,22 +49,24 @@ public class ${table.controllerName} {
     ${table.serviceImplName} ${table.serviceImplName ?uncap_first};
 
     /**
-             * 新增${table.comment}
-    * @return
-    */
+     * 新增${table.comment}
+     *
+     * @return
+     */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增${table.comment}", notes = "新增${table.comment}")
-	public ResponseModel<${entity}Dto> save(@RequestBody ${entity}Dto model)
-	{
-	    model=${table.serviceImplName ?uncap_first}.createWithModel(model);
+	public ResponseModel<${entity}Dto> save(@RequestBody ${entity}Dto model) {
+	    model = ${table.serviceImplName ?uncap_first}.createWithModel(model);
 	    return ResponseHelper.buildResponse(model);
 	}
+
 	/**
-             * 根据sequenceNbr更新
-    * @param sequenceNbr 主键
-    * @return
-    */
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PutMapping(value = "/{sequenceNbr}")
 	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新${table.comment}", notes = "根据sequenceNbr更新${table.comment}")
@@ -72,55 +74,61 @@ public class ${table.controllerName} {
 	    model.setSequenceNbr(sequenceNbr);
 	    return ResponseHelper.buildResponse(${table.serviceImplName ?uncap_first}.updateWithModel(model));
 	}
+
 	/**
-             * 根据sequenceNbr删除
-    * @param sequenceNbr 主键
-    * @return
-    */
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @DeleteMapping(value = "/{sequenceNbr}")
     @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除${table.comment}", notes = "根据sequenceNbr删除${table.comment}")
     public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
         return ResponseHelper.buildResponse(${table.serviceImplName ?uncap_first}.removeById(sequenceNbr));
     }
+
     /**
-             * 根据sequenceNbr查询
-    * @param sequenceNbr  主键
-    * @return
-    */
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/{sequenceNbr}")
 	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个${table.comment}",  notes = "根据sequenceNbr查询单个${table.comment}")
-	public ResponseModel<${entity}Dto> seleteOne(@PathVariable Long sequenceNbr)
-	{
+	public ResponseModel<${entity}Dto> selectOne(@PathVariable Long sequenceNbr) {
 	    return ResponseHelper.buildResponse(${table.serviceImplName ?uncap_first}.queryBySeq(sequenceNbr));
 	}
+
 	/**
-             * 列表分页查询
-    *@param current 当前页
-    *@param current 每页大小
-    * @return
-    */
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/page")
 	@ApiOperation(httpMethod = "GET",value = "${table.comment}分页查询",  notes = "${table.comment}分页查询")
-	public ResponseModel<Page<${entity}Dto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam(value = "size") int size)
-	{
-	    Page<${entity}Dto> page=new Page<${entity}Dto>();
+	public ResponseModel<Page<${entity}Dto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<${entity}Dto> page = new Page<${entity}Dto>();
 	    page.setCurrent(current);
 	    page.setSize(size);
 	    return ResponseHelper.buildResponse(${table.serviceImplName ?uncap_first}.queryFor${entity}Page(page));
 	}
+
 	/**
-	*列表全部数据查询
-	*@return
-	*/
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "GET",value = "${table.comment}列表全部数据查询",   notes = "${table.comment}列表全部数据查询")
 	@GetMapping(value = "/list")
-	public ResponseModel<List<${entity}Dto>>  selectForList()
-	{
+	public ResponseModel<List<${entity}Dto>> selectForList() {
 	    return ResponseHelper.buildResponse(${table.serviceImplName ?uncap_first}.queryFor${entity}List());
 	}
 }
-</#if>
+</#if>
\ No newline at end of file

amos-boot-biz-common/src/main/resources/template/dto.java.ftl

@@ -7,12 +7,14 @@ import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 </#if>
+import java.util.Date;
+
 /**
-* ${table.comment!}
-*
-* @author ${author}
-* @date ${date}
-*/
+ * ${table.comment!}
+ *
+ * @author ${author}
+ * @date ${date}
+ */
 <#if entityLombokModel>
 @Data
     <#if superEntityClass??>
@@ -28,7 +30,6 @@ public class ${entity}Dto  extends BaseDto {
 
    private static final long serialVersionUID = 1L;
 
-
 <#-- ----------  BEGIN 字段循环遍历  ---------->
 <#list table.fields as field>
     <#if field.keyFlag>

amos-boot-biz-common/src/main/resources/template/serviceImpl.java.ftl

@@ -8,25 +8,26 @@ import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import java.util.List;
+
 /**
-* ${table.comment!}服务实现类
-*
-* @author ${author}
-* @date ${date}
-*/
+ * ${table.comment!}服务实现类
+ *
+ * @author ${author}
+ * @date ${date}
+ */
 @Service
 public class ${table.serviceImplName} extends BaseService<${entity}Dto,${entity},${table.mapperName}> implements ${table.serviceName} {
-        /**
-                            * 分页查询
-         */
-        public Page<${entity}Dto> queryFor${entity}Page(Page<${entity}Dto> page)   {
-                return this.queryForPage(page, null, false);
-        }
+    /**
+     * 分页查询
+     */
+    public Page<${entity}Dto> queryFor${entity}Page(Page<${entity}Dto> page)   {
+        return this.queryForPage(page, null, false);
+    }
 
-        /**
-                            * 列表查询 示例
-         */
-        public List<${entity}Dto> queryFor${entity}List()   {
-                return this.queryForList("" , false);
-        }
-}
+    /**
+     * 列表查询 示例
+     */
+    public List<${entity}Dto> queryFor${entity}List()   {
+        return this.queryForList("" , false);
+    }
+}
\ No newline at end of file

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

@@ -5,15 +5,14 @@ import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-
 import java.util.Date;
 
 /**
-* 维保合同
-*
-* @author system_generator
-* @date 2021-07-16
-*/
+ * 维保合同
+ *
+ * @author system_generator
+ * @date 2021-07-16
+ */
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ApiModel(value="ContractDto", description="维保合同")
@@ -22,7 +21,6 @@ public class ContractDto  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/dto/LinkageUnitDto.java

@@ -5,15 +5,14 @@ import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-
 import java.util.Date;
 
 /**
-* 联动单位
-*
-* @author system_generator
-* @date 2021-07-16
-*/
+ * 联动单位
+ *
+ * @author system_generator
+ * @date 2021-07-16
+ */
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ApiModel(value="LinkageUnitDto", description="联动单位")
@@ -22,7 +21,6 @@ public class LinkageUnitDto  extends BaseDto {
    private static final long serialVersionUID = 1L;
 
 
-
     @ApiModelProperty(value = "单位名称")
     private String unitName;
 

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

+package com.yeejoin.amos.boot.module.common.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+
+/**
+ * 维保单位
+ *
+ * @author system_generator
+ * @date 2021-07-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="MaintenanceCompanyDto", description="维保单位")
+public class MaintenanceCompanyDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "企业名称")
+    private String name;
+
+    @ApiModelProperty(value = "单位编码")
+    private String code;
+
+    @ApiModelProperty(value = "类型（COMPANY单位，PERSON人员）")
+    private String type;
+
+    @ApiModelProperty(value = "上级单位")
+    private Long parentId;
+
+    @ApiModelProperty(value = "业务编码")
+    private String bizCode;
+
+    @ApiModelProperty(value = "组织机构代码用于权限过滤")
+    private String orgCode;
+
+    @ApiModelProperty(value = "纬度")
+    private String latitude;
+
+    @ApiModelProperty(value = "经度")
+    private String longitude;
+
+    @ApiModelProperty(value = "动态表单实例id")
+    private Long instanceId;
+
+    @ApiModelProperty(value = "更新人")
+    private String recUserName;
+
+}

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

@@ -2,11 +2,10 @@ 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;
 
 /**
@@ -23,79 +22,78 @@ public class Contract extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
 
-
     /**
-	  * 合同名称
+     * 合同名称
      */
 	@TableField("name")
     private String name;
     /**
-	  * 签订单位名称
+     * 签订单位名称
      */
 	@TableField("signed_company")
     private String signedCompany;
     /**
-	  * 签订单位id
+     * 签订单位id
      */
 	@TableField("signed_company_id")
     private Long signedCompanyId;
     /**
-	  * 合同开始日期
+     * 合同开始日期
      */
 	@TableField("begin_date")
     private Date beginDate;
     /**
-	  * 合同结束日期
+     * 合同结束日期
      */
 	@TableField("end_date")
     private Date endDate;
     /**
-	  * 签订日期
+     * 签订日期
      */
 	@TableField("signed_date")
     private Date signedDate;
     /**
-	  * 合同编号
+     * 合同编号
      */
 	@TableField("contract_no")
     private String contractNo;
     /**
-	  * 机构代码用于权限过滤
+     * 机构代码用于权限过滤
      */
 	@TableField("org_code")
     private Boolean orgCode;
     /**
-	  * 单位名称
+     * 单位名称
      */
 	@TableField("company")
     private String company;
     /**
-	  * 单位id
+     * 单位id
      */
 	@TableField("company_id")
     private Long companyId;
     /**
-	  * 更新人名称
+     * 更新人名称
      */
 	@TableField("rec_user_name")
     private String recUserName;
     /**
-	  * 单位类型（1维保单位，0联动单位）
+     * 单位类型（1维保单位，0联动单位）
      */
 	@TableField("company_type")
     private String companyType;
     /**
-	  * 合同类型code
+     * 合同类型code
      */
 	@TableField("type_code")
     private String typeCode;
     /**
-	  * 合同类型
+     * 合同类型
      */
 	@TableField("type")
     private String type;
     /**
-	  * 服务内容
+     * 服务内容
      */
 	@TableField("service_content")
     private String serviceContent;

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

@@ -2,11 +2,10 @@ 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;
 
 /**
@@ -23,99 +22,98 @@ public class LinkageUnit extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
 
-
     /**
-	  * 单位名称
+     * 单位名称
      */
 	@TableField("unit_name")
     private String unitName;
     /**
-	  * 单位id
+     * 单位id
      */
 	@TableField("unit_id")
     private String unitId;
     /**
-	  * 父级单位id
+     * 父级单位id
      */
 	@TableField("parent_id")
     private String parentId;
     /**
-	  * 联动单位类别
+     * 联动单位类别
      */
 	@TableField("linkage_unit_type")
     private String linkageUnitType;
     /**
-	  * 联动单位类别code
+     * 联动单位类别code
      */
 	@TableField("linkage_unit_type_code")
     private String linkageUnitTypeCode;
     /**
-	  * 行政区划
+     * 行政区划
      */
 	@TableField("administrative_divisions")
     private String administrativeDivisions;
     /**
-	  * 行政区划代码
+     * 行政区划代码
      */
 	@TableField("administrative_divisions_code")
     private String administrativeDivisionsCode;
     /**
-	  * 地址
+     * 地址
      */
 	@TableField("address")
     private String address;
     /**
-	  * 经度
+     * 经度
      */
 	@TableField("longitude")
     private Double longitude;
     /**
-	  * 纬度
+     * 纬度
      */
 	@TableField("latitude")
     private Double latitude;
     /**
-	  * 协议开始日期
+     * 协议开始日期
      */
 	@TableField("agreement_start_date")
     private Date agreementStartDate;
     /**
-	  * 协议结束日期
+     * 协议结束日期
      */
 	@TableField("agreement_end_date")
     private Date agreementEndDate;
     /**
-	  * 应急联动单位类别
+     * 应急联动单位类别
      */
 	@TableField("emergency_linkage_unit")
     private String emergencyLinkageUnit;
     /**
-	  * 应急联动单位类别code
+     * 应急联动单位类别code
      */
 	@TableField("emergency_linkage_unit_code")
     private String emergencyLinkageUnitCode;
     /**
-	  * 联系人 
+     * 联系人 
      */
 	@TableField("contact_user")
     private String contactUser;
     /**
-	  * 联系人电话
+     * 联系人电话
      */
 	@TableField("contact_phone")
     private String contactPhone;
     /**
-	  * 实例id
+     * 实例id
      */
 	@TableField("instance_id")
     private Long instanceId;
     /**
-	  * 组织机构代码
+     * 组织机构代码
      */
 	@TableField("org_code")
     private String orgCode;
     /**
-	  * 操作人名称
+     * 操作人名称
      */
 	@TableField("rec_user_name")
     private String recUserName;

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

+package com.yeejoin.amos.boot.module.common.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.util.Date;
+
+/**
+* 维保单位
+*
+* @author system_generator
+* @date 2021-07-16
+*/
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("cb_maintenance_company")
+public class MaintenanceCompany extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 企业名称
+     */
+	@TableField("name")
+    private String name;
+    /**
+     * 单位编码
+     */
+	@TableField("code")
+    private String code;
+    /**
+     * 类型（COMPANY单位，PERSON人员）
+     */
+	@TableField("type")
+    private String type;
+    /**
+     * 上级单位
+     */
+	@TableField("parent_id")
+    private Long parentId;
+    /**
+     * 业务编码
+     */
+	@TableField("biz_code")
+    private String bizCode;
+    /**
+     * 组织机构代码用于权限过滤
+     */
+	@TableField("org_code")
+    private String orgCode;
+    /**
+     * 纬度
+     */
+	@TableField("latitude")
+    private String latitude;
+    /**
+     * 经度
+     */
+	@TableField("longitude")
+    private String longitude;
+    /**
+     * 动态表单实例id
+     */
+	@TableField("instance_id")
+    private Long instanceId;
+    /**
+     * 更新人
+     */
+	@TableField("rec_user_name")
+    private String recUserName;
+}

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

 package com.yeejoin.amos.boot.module.common.api.mapper;
 
-import com.yeejoin.amos.boot.module.common.api.entity.Contract;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.common.api.entity.Contract;
 
 /**
 * 维保合同 Mapper 接口

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

 package com.yeejoin.amos.boot.module.common.api.mapper;
 
-import com.yeejoin.amos.boot.module.common.api.entity.LinkageUnit;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.common.api.entity.LinkageUnit;
 
 /**
 * 联动单位 Mapper 接口

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

+package com.yeejoin.amos.boot.module.common.api.mapper;
+
+import com.yeejoin.amos.boot.module.common.api.entity.MaintenanceCompany;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* 维保单位 Mapper 接口
+*
+* @author system_generator
+* @date 2021-07-16
+*/
+public interface MaintenanceCompanyMapper extends BaseMapper<MaintenanceCompany> {
+
+}

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

+package com.yeejoin.amos.boot.module.common.api.service;
+
+
+/**
+* 维保单位接口类
+*
+* @author system_generator
+* @date 2021-07-16
+*/
+public interface IMaintenanceCompanyService {
+
+}

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

+<?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.yeejoin.amos.boot.module.common.api.mapper.MaintenanceCompanyMapper">
+
+</mapper>

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

@@ -18,11 +18,11 @@ import org.typroject.tyboot.core.foundation.enumeration.UserType;
 
 
 /**
-* 维保合同
-*
-* @author system_generator
-* @date 2021-07-16
-*/
+ * 维保合同
+ *
+ * @author system_generator
+ * @date 2021-07-16
+ */
 @RestController
 @Api(tags = "维保合同Api")
 @RequestMapping(value = "/common/contract")
@@ -32,22 +32,24 @@ public class ContractController extends BaseController {
     ContractServiceImpl contractServiceImpl;
 
     /**
-             * 新增维保合同
-    * @return
-    */
+     * 新增维保合同
+     *
+     * @return
+     */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增维保合同", notes = "新增维保合同")
-	public ResponseModel<ContractDto> save(@RequestBody ContractDto model)
-	{
-	    model=contractServiceImpl.createWithModel(model);
+	public ResponseModel<ContractDto> save(@RequestBody ContractDto model) {
+	    model = contractServiceImpl.createWithModel(model);
 	    return ResponseHelper.buildResponse(model);
 	}
+
 	/**
-             * 根据sequenceNbr更新
-    * @param sequenceNbr 主键
-    * @return
-    */
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PutMapping(value = "/{sequenceNbr}")
 	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新维保合同", notes = "根据sequenceNbr更新维保合同")
@@ -55,54 +57,60 @@ public class ContractController extends BaseController {
 	    model.setSequenceNbr(sequenceNbr);
 	    return ResponseHelper.buildResponse(contractServiceImpl.updateWithModel(model));
 	}
+
 	/**
-             * 根据sequenceNbr删除
-    * @param sequenceNbr 主键
-    * @return
-    */
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @DeleteMapping(value = "/{sequenceNbr}")
     @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除维保合同", notes = "根据sequenceNbr删除维保合同")
     public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
         return ResponseHelper.buildResponse(contractServiceImpl.removeById(sequenceNbr));
     }
+
     /**
-             * 根据sequenceNbr查询
-    * @param sequenceNbr  主键
-    * @return
-    */
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/{sequenceNbr}")
 	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个维保合同",  notes = "根据sequenceNbr查询单个维保合同")
-	public ResponseModel<ContractDto> seleteOne(@PathVariable Long sequenceNbr)
-	{
+	public ResponseModel<ContractDto> selectOne(@PathVariable Long sequenceNbr) {
 	    return ResponseHelper.buildResponse(contractServiceImpl.queryBySeq(sequenceNbr));
 	}
+
 	/**
-             * 列表分页查询
-    *@param current 当前页
-    *@param current 每页大小
-    * @return
-    */
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/page")
 	@ApiOperation(httpMethod = "GET",value = "维保合同分页查询",  notes = "维保合同分页查询")
-	public ResponseModel<Page<ContractDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam(value = "size") int size)
-	{
-	    Page<ContractDto> page=new Page<ContractDto>();
+	public ResponseModel<Page<ContractDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<ContractDto> page = new Page<ContractDto>();
 	    page.setCurrent(current);
 	    page.setSize(size);
 	    return ResponseHelper.buildResponse(contractServiceImpl.queryForContractPage(page));
 	}
+
 	/**
-	*列表全部数据查询
-	*@return
-	*/
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "GET",value = "维保合同列表全部数据查询",   notes = "维保合同列表全部数据查询")
 	@GetMapping(value = "/list")
-	public ResponseModel<List<ContractDto>>  selectForList()
-	{
+	public ResponseModel<List<ContractDto>> selectForList() {
 	    return ResponseHelper.buildResponse(contractServiceImpl.queryForContractList());
 	}
 }

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

@@ -18,11 +18,11 @@ import org.typroject.tyboot.core.foundation.enumeration.UserType;
 
 
 /**
-* 联动单位
-*
-* @author system_generator
-* @date 2021-07-16
-*/
+ * 联动单位
+ *
+ * @author system_generator
+ * @date 2021-07-16
+ */
 @RestController
 @Api(tags = "联动单位Api")
 @RequestMapping(value = "/common/linkage-unit")
@@ -32,22 +32,24 @@ public class LinkageUnitController extends BaseController {
     LinkageUnitServiceImpl linkageUnitServiceImpl;
 
     /**
-             * 新增联动单位
-    * @return
-    */
+     * 新增联动单位
+     *
+     * @return
+     */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增联动单位", notes = "新增联动单位")
-	public ResponseModel<LinkageUnitDto> save(@RequestBody LinkageUnitDto model)
-	{
-	    model=linkageUnitServiceImpl.createWithModel(model);
+	public ResponseModel<LinkageUnitDto> save(@RequestBody LinkageUnitDto model) {
+	    model = linkageUnitServiceImpl.createWithModel(model);
 	    return ResponseHelper.buildResponse(model);
 	}
+
 	/**
-             * 根据sequenceNbr更新
-    * @param sequenceNbr 主键
-    * @return
-    */
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PutMapping(value = "/{sequenceNbr}")
 	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新联动单位", notes = "根据sequenceNbr更新联动单位")
@@ -55,54 +57,60 @@ public class LinkageUnitController extends BaseController {
 	    model.setSequenceNbr(sequenceNbr);
 	    return ResponseHelper.buildResponse(linkageUnitServiceImpl.updateWithModel(model));
 	}
+
 	/**
-             * 根据sequenceNbr删除
-    * @param sequenceNbr 主键
-    * @return
-    */
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @DeleteMapping(value = "/{sequenceNbr}")
     @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除联动单位", notes = "根据sequenceNbr删除联动单位")
     public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
         return ResponseHelper.buildResponse(linkageUnitServiceImpl.removeById(sequenceNbr));
     }
+
     /**
-             * 根据sequenceNbr查询
-    * @param sequenceNbr  主键
-    * @return
-    */
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/{sequenceNbr}")
 	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个联动单位",  notes = "根据sequenceNbr查询单个联动单位")
-	public ResponseModel<LinkageUnitDto> seleteOne(@PathVariable Long sequenceNbr)
-	{
+	public ResponseModel<LinkageUnitDto> selectOne(@PathVariable Long sequenceNbr) {
 	    return ResponseHelper.buildResponse(linkageUnitServiceImpl.queryBySeq(sequenceNbr));
 	}
+
 	/**
-             * 列表分页查询
-    *@param current 当前页
-    *@param current 每页大小
-    * @return
-    */
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/page")
 	@ApiOperation(httpMethod = "GET",value = "联动单位分页查询",  notes = "联动单位分页查询")
-	public ResponseModel<Page<LinkageUnitDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam(value = "size") int size)
-	{
-	    Page<LinkageUnitDto> page=new Page<LinkageUnitDto>();
+	public ResponseModel<Page<LinkageUnitDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<LinkageUnitDto> page = new Page<LinkageUnitDto>();
 	    page.setCurrent(current);
 	    page.setSize(size);
 	    return ResponseHelper.buildResponse(linkageUnitServiceImpl.queryForLinkageUnitPage(page));
 	}
+
 	/**
-	*列表全部数据查询
-	*@return
-	*/
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "GET",value = "联动单位列表全部数据查询",   notes = "联动单位列表全部数据查询")
 	@GetMapping(value = "/list")
-	public ResponseModel<List<LinkageUnitDto>>  selectForList()
-	{
+	public ResponseModel<List<LinkageUnitDto>> selectForList() {
 	    return ResponseHelper.buildResponse(linkageUnitServiceImpl.queryForLinkageUnitList());
 	}
 }

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

+package com.yeejoin.amos.boot.module.common.biz.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.common.api.dto.MaintenanceCompanyDto;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.MaintenanceCompanyServiceImpl;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+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 javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+
+/**
+ * 维保单位
+ *
+ * @author system_generator
+ * @date 2021-07-16
+ */
+@RestController
+@Api(tags = "维保单位Api")
+@RequestMapping(value = "/common/maintenance-company")
+public class MaintenanceCompanyController extends BaseController {
+
+    @Autowired
+    MaintenanceCompanyServiceImpl maintenanceCompanyServiceImpl;
+
+    /**
+     * 新增维保单位
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/save")
+    @ApiOperation(httpMethod = "POST", value = "新增维保单位", notes = "新增维保单位")
+    public ResponseModel<MaintenanceCompanyDto> save(@RequestBody MaintenanceCompanyDto model) {
+        model = maintenanceCompanyServiceImpl.createWithModel(model);
+        return ResponseHelper.buildResponse(model);
+    }
+
+    /**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PutMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新维保单位", notes = "根据sequenceNbr更新维保单位")
+    public ResponseModel<MaintenanceCompanyDto> updateBySequenceNbrMaintenanceCompany(@RequestBody MaintenanceCompanyDto model, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+        model.setSequenceNbr(sequenceNbr);
+        return ResponseHelper.buildResponse(maintenanceCompanyServiceImpl.updateWithModel(model));
+    }
+
+    /**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除维保单位", notes = "根据sequenceNbr删除维保单位")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+        return ResponseHelper.buildResponse(maintenanceCompanyServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个维保单位", notes = "根据sequenceNbr查询单个维保单位")
+    public ResponseModel<MaintenanceCompanyDto> seleteOne(@PathVariable Long sequenceNbr) {
+        return ResponseHelper.buildResponse(maintenanceCompanyServiceImpl.queryBySeq(sequenceNbr));
+    }
+
+    /**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/page")
+    @ApiOperation(httpMethod = "GET", value = "维保单位分页查询", notes = "维保单位分页查询")
+    public ResponseModel<Page<MaintenanceCompanyDto>> queryForPage(@RequestParam(value = "current") int current, @RequestParam(value = "size") int size) {
+        Page<MaintenanceCompanyDto> page = new Page<MaintenanceCompanyDto>();
+        page.setCurrent(current);
+        page.setSize(size);
+        return ResponseHelper.buildResponse(maintenanceCompanyServiceImpl.queryForMaintenanceCompanyPage(page));
+    }
+
+    /**
+     * 列表全部数据查询
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "维保单位列表全部数据查询", notes = "维保单位列表全部数据查询")
+    @GetMapping(value = "/list")
+    public ResponseModel<List<MaintenanceCompanyDto>> selectForList() {
+        return ResponseHelper.buildResponse(maintenanceCompanyServiceImpl.queryForMaintenanceCompanyList());
+    }
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/ContractServiceImpl.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.ContractDto;
 import com.yeejoin.amos.boot.module.common.api.entity.Contract;
 import com.yeejoin.amos.boot.module.common.api.mapper.ContractMapper;
 import com.yeejoin.amos.boot.module.common.api.service.IContractService;
-import com.yeejoin.amos.boot.module.common.api.dto.ContractDto;
-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-16
-*/
+ * 维保合同服务实现类
+ *
+ * @author system_generator
+ * @date 2021-07-16
+ */
 @Service
-public class ContractServiceImpl extends BaseService<ContractDto,Contract,ContractMapper> implements IContractService {
-        /**
-                            * 分页查询
-         */
-        public Page<ContractDto> queryForContractPage(Page<ContractDto> page)   {
-                return this.queryForPage(page, null, false);
-        }
+public class ContractServiceImpl extends BaseService<ContractDto, Contract, ContractMapper> implements IContractService {
+    /**
+     * 分页查询
+     */
+    public Page<ContractDto> queryForContractPage(Page<ContractDto> page) {
+        return this.queryForPage(page, null, false);
+    }
 
-        /**
-                            * 列表查询 示例
-         */
-        public List<ContractDto> queryForContractList()   {
-                return this.queryForList("" , false);
-        }
-}
+    /**
+     * 列表查询 示例
+     */
+    public List<ContractDto> queryForContractList() {
+        return this.queryForList("", false);
+    }
+}
\ No newline at end of file

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

@@ -8,25 +8,26 @@ import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import java.util.List;
+
 /**
-* 联动单位服务实现类
-*
-* @author system_generator
-* @date 2021-07-16
-*/
+ * 联动单位服务实现类
+ *
+ * @author system_generator
+ * @date 2021-07-16
+ */
 @Service
-public class LinkageUnitServiceImpl extends BaseService<LinkageUnitDto,LinkageUnit,LinkageUnitMapper> implements ILinkageUnitService {
-        /**
-                            * 分页查询
-         */
-        public Page<LinkageUnitDto> queryForLinkageUnitPage(Page<LinkageUnitDto> page)   {
-                return this.queryForPage(page, null, false);
-        }
+public class LinkageUnitServiceImpl extends BaseService<LinkageUnitDto, LinkageUnit, LinkageUnitMapper> implements ILinkageUnitService {
+    /**
+     * 分页查询
+     */
+    public Page<LinkageUnitDto> queryForLinkageUnitPage(Page<LinkageUnitDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
 
-        /**
-                            * 列表查询 示例
-         */
-        public List<LinkageUnitDto> queryForLinkageUnitList()   {
-                return this.queryForList("" , false);
-        }
-}
+    /**
+     * 列表查询 示例
+     */
+    public List<LinkageUnitDto> queryForLinkageUnitList()   {
+        return this.queryForList("" , false);
+    }
+}
\ No newline at end of file

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

+package com.yeejoin.amos.boot.module.common.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.common.api.entity.MaintenanceCompany;
+import com.yeejoin.amos.boot.module.common.api.mapper.MaintenanceCompanyMapper;
+import com.yeejoin.amos.boot.module.common.api.service.IMaintenanceCompanyService;
+import com.yeejoin.amos.boot.module.common.api.dto.MaintenanceCompanyDto;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import java.util.List;
+
+/**
+ * 维保单位服务实现类
+ *
+ * @author system_generator
+ * @date 2021-07-16
+ */
+@Service
+public class MaintenanceCompanyServiceImpl extends BaseService<MaintenanceCompanyDto,MaintenanceCompany,MaintenanceCompanyMapper> implements IMaintenanceCompanyService {
+    /**
+     * 分页查询
+     */
+    public Page<MaintenanceCompanyDto> queryForMaintenanceCompanyPage(Page<MaintenanceCompanyDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<MaintenanceCompanyDto> queryForMaintenanceCompanyList()   {
+        return this.queryForList("" , false);
+    }
+}
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/ShiftChangeController.java

 package com.yeejoin.amos.boot.module.jcs.biz.controller;
 
-import com.itextpdf.text.DocumentException;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.jcs.api.dto.ShiftChangeInfoDto;
 import com.yeejoin.amos.boot.module.jcs.api.service.IShiftChangeService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.foundation.utils.Bean;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
@@ -15,7 +21,6 @@ import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
 
 
 /**