1.机构表和机构服务关系表

hmit-admin/src/main/java/io/hmit/modules/serviceOrder/dto/PensionOrganizationDTO.java

@@ -28,8 +28,8 @@ public class PensionOrganizationDTO implements Serializable {
 	@ApiModelProperty(value = "机构图标")
 	private String icon;
 
-	@ApiModelProperty(value = "服务ID")
-	private Long serviceId;
+	@ApiModelProperty(value = "机构描述")
+	private String description;
 
 	@ApiModelProperty(value = "创建者")
 	private Long creator;
@@ -37,11 +37,5 @@ public class PensionOrganizationDTO implements Serializable {
 	@ApiModelProperty(value = "创建时间")
 	private Date createDate;
 
-	@ApiModelProperty(value = "更新者")
-	private Long updater;
-
-	@ApiModelProperty(value = "更新时间")
-	private Date updateDate;
-
 
 }
\ No newline at end of file

hmit-admin/src/main/java/io/hmit/modules/serviceOrder/dto/PensionOrganizationServiceDTO.java

@@ -22,7 +22,7 @@ public class PensionOrganizationServiceDTO implements Serializable {
 	@ApiModelProperty(value = "id")
 	private Long id;
 
-	@ApiModelProperty(value = "角色ID")
+	@ApiModelProperty(value = "机构ID")
 	private Long organizationId;
 
 	@ApiModelProperty(value = "服务ID")
@@ -34,11 +34,5 @@ public class PensionOrganizationServiceDTO implements Serializable {
 	@ApiModelProperty(value = "创建时间")
 	private Date createDate;
 
-	@ApiModelProperty(value = "更新者")
-	private Long updater;
-
-	@ApiModelProperty(value = "更新时间")
-	private Date updateDate;
-
 
 }
\ No newline at end of file

hmit-admin/src/main/java/io/hmit/modules/serviceOrder/entity/PensionOrganizationEntity.java

@@ -28,15 +28,7 @@ public class PensionOrganizationEntity extends BaseEntity {
      */
 	private String icon;
     /**
-     * 服务ID
+     * 机构描述
      */
-	private Long serviceId;
-    /**
-     * 更新者
-     */
-	private Long updater;
-    /**
-     * 更新时间
-     */
-	private Date updateDate;
+	private String description;
 }
\ No newline at end of file

hmit-admin/src/main/java/io/hmit/modules/serviceOrder/entity/PensionOrganizationServiceEntity.java

@@ -20,19 +20,11 @@ public class PensionOrganizationServiceEntity extends BaseEntity {
 	private static final long serialVersionUID = 1L;
 
     /**
-     * 角色ID
+     * 机构ID
      */
 	private Long organizationId;
     /**
      * 服务ID
      */
 	private Long serviceId;
-    /**
-     * 更新者
-     */
-	private Long updater;
-    /**
-     * 更新时间
-     */
-	private Date updateDate;
 }
\ No newline at end of file

hmit-admin/src/main/java/io/hmit/modules/serviceOrder/excel/PensionOrganizationExcel.java

@@ -19,15 +19,11 @@ public class PensionOrganizationExcel {
     private String name;
     @Excel(name = "机构图标")
     private String icon;
-    @Excel(name = "服务ID")
-    private Long serviceId;
+    @Excel(name = "机构描述")
+    private String description;
     @Excel(name = "创建者")
     private Long creator;
     @Excel(name = "创建时间")
     private Date createDate;
-    @Excel(name = "更新者")
-    private Long updater;
-    @Excel(name = "更新时间")
-    private Date updateDate;
 
 }
\ No newline at end of file

hmit-admin/src/main/java/io/hmit/modules/serviceOrder/excel/PensionOrganizationServiceExcel.java

@@ -15,7 +15,7 @@ import java.util.Date;
 public class PensionOrganizationServiceExcel {
     @Excel(name = "id")
     private Long id;
-    @Excel(name = "角色ID")
+    @Excel(name = "机构ID")
     private Long organizationId;
     @Excel(name = "服务ID")
     private Long serviceId;
@@ -23,9 +23,5 @@ public class PensionOrganizationServiceExcel {
     private Long creator;
     @Excel(name = "创建时间")
     private Date createDate;
-    @Excel(name = "更新者")
-    private Long updater;
-    @Excel(name = "更新时间")
-    private Date updateDate;
 
 }
\ No newline at end of file

hmit-admin/src/main/resources/mapper/serviceOrder/PensionOrganizationDao.xml

@@ -7,11 +7,9 @@
         <result property="id" column="id"/>
         <result property="name" column="name"/>
         <result property="icon" column="icon"/>
-        <result property="serviceId" column="service_id"/>
+        <result property="description" column="description"/>
         <result property="creator" column="creator"/>
         <result property="createDate" column="create_date"/>
-        <result property="updater" column="updater"/>
-        <result property="updateDate" column="update_date"/>
     </resultMap>
 
 

hmit-admin/src/main/resources/mapper/serviceOrder/PensionOrganizationServiceDao.xml

@@ -9,8 +9,6 @@
         <result property="serviceId" column="service_id"/>
         <result property="creator" column="creator"/>
         <result property="createDate" column="create_date"/>
-        <result property="updater" column="updater"/>
-        <result property="updateDate" column="update_date"/>
     </resultMap>
 
 

hmit-api/src/main/java/io/hmit/modules/serviceOrder/controller/PensionOrderServiceController.java

@@ -19,8 +19,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
 import java.util.Map;
 
 

hmit-api/src/main/java/io/hmit/modules/serviceOrder/controller/PensionOrganizationController.java

@@ -9,7 +9,6 @@ import io.hmit.common.validator.group.AddGroup;
 import io.hmit.common.validator.group.DefaultGroup;
 import io.hmit.common.validator.group.UpdateGroup;
 import io.hmit.modules.serviceOrder.dto.PensionOrganizationDTO;
-import io.hmit.modules.serviceOrder.excel.PensionOrganizationExcel;
 import io.hmit.modules.serviceOrder.service.PensionOrganizationService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -19,8 +18,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
 import java.util.Map;
 
 

hmit-api/src/main/java/io/hmit/modules/serviceOrder/controller/PensionOrganizationServiceController.java

@@ -9,7 +9,6 @@ import io.hmit.common.validator.group.AddGroup;
 import io.hmit.common.validator.group.DefaultGroup;
 import io.hmit.common.validator.group.UpdateGroup;
 import io.hmit.modules.serviceOrder.dto.PensionOrganizationServiceDTO;
-import io.hmit.modules.serviceOrder.excel.PensionOrganizationServiceExcel;
 import io.hmit.modules.serviceOrder.service.PensionOrganizationServiceService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -19,8 +18,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
 import java.util.Map;
 
 

hmit-api/src/main/java/io/hmit/modules/serviceOrder/dto/PensionOrganizationDTO.java

@@ -28,8 +28,8 @@ public class PensionOrganizationDTO implements Serializable {
 	@ApiModelProperty(value = "机构图标")
 	private String icon;
 
-	@ApiModelProperty(value = "服务ID")
-	private Long serviceId;
+	@ApiModelProperty(value = "机构描述")
+	private String description;
 
 	@ApiModelProperty(value = "创建者")
 	private Long creator;
@@ -37,11 +37,5 @@ public class PensionOrganizationDTO implements Serializable {
 	@ApiModelProperty(value = "创建时间")
 	private Date createDate;
 
-	@ApiModelProperty(value = "更新者")
-	private Long updater;
-
-	@ApiModelProperty(value = "更新时间")
-	private Date updateDate;
-
 
 }
\ No newline at end of file

hmit-api/src/main/java/io/hmit/modules/serviceOrder/dto/PensionOrganizationServiceDTO.java

@@ -22,7 +22,7 @@ public class PensionOrganizationServiceDTO implements Serializable {
 	@ApiModelProperty(value = "id")
 	private Long id;
 
-	@ApiModelProperty(value = "角色ID")
+	@ApiModelProperty(value = "机构ID")
 	private Long organizationId;
 
 	@ApiModelProperty(value = "服务ID")
@@ -34,11 +34,5 @@ public class PensionOrganizationServiceDTO implements Serializable {
 	@ApiModelProperty(value = "创建时间")
 	private Date createDate;
 
-	@ApiModelProperty(value = "更新者")
-	private Long updater;
-
-	@ApiModelProperty(value = "更新时间")
-	private Date updateDate;
-
 
 }
\ No newline at end of file

hmit-api/src/main/java/io/hmit/modules/serviceOrder/entity/PensionOrganizationEntity.java

@@ -28,15 +28,7 @@ public class PensionOrganizationEntity extends BaseEntity {
      */
 	private String icon;
     /**
-     * 服务ID
+     * 机构描述
      */
-	private Long serviceId;
-    /**
-     * 更新者
-     */
-	private Long updater;
-    /**
-     * 更新时间
-     */
-	private Date updateDate;
+	private String description;
 }
\ No newline at end of file

hmit-api/src/main/java/io/hmit/modules/serviceOrder/entity/PensionOrganizationServiceEntity.java

@@ -20,19 +20,11 @@ public class PensionOrganizationServiceEntity extends BaseEntity {
 	private static final long serialVersionUID = 1L;
 
     /**
-     * 角色ID
+     * 机构ID
      */
 	private Long organizationId;
     /**
      * 服务ID
      */
 	private Long serviceId;
-    /**
-     * 更新者
-     */
-	private Long updater;
-    /**
-     * 更新时间
-     */
-	private Date updateDate;
 }
\ No newline at end of file

hmit-api/src/main/java/io/hmit/modules/serviceOrder/excel/PensionOrganizationExcel.java

-package io.hmit.modules.serviceOrder.excel;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * 机构表
- *
- * @author zsh 408538940@qq.com
- * @since 1.0.0 2021-03-10
- */
-@Data
-public class PensionOrganizationExcel {
-    @Excel(name = "id")
-    private Long id;
-    @Excel(name = "机构名称")
-    private String name;
-    @Excel(name = "机构图标")
-    private String icon;
-    @Excel(name = "服务ID")
-    private Long serviceId;
-    @Excel(name = "创建者")
-    private Long creator;
-    @Excel(name = "创建时间")
-    private Date createDate;
-    @Excel(name = "更新者")
-    private Long updater;
-    @Excel(name = "更新时间")
-    private Date updateDate;
-
-}
\ No newline at end of file

hmit-api/src/main/java/io/hmit/modules/serviceOrder/excel/PensionOrganizationServiceExcel.java

-package io.hmit.modules.serviceOrder.excel;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * 机构服务关系
- *
- * @author zsh 408538940@qq.com
- * @since 1.0.0 2021-03-10
- */
-@Data
-public class PensionOrganizationServiceExcel {
-    @Excel(name = "id")
-    private Long id;
-    @Excel(name = "角色ID")
-    private Long organizationId;
-    @Excel(name = "服务ID")
-    private Long serviceId;
-    @Excel(name = "创建者")
-    private Long creator;
-    @Excel(name = "创建时间")
-    private Date createDate;
-    @Excel(name = "更新者")
-    private Long updater;
-    @Excel(name = "更新时间")
-    private Date updateDate;
-
-}
\ No newline at end of file

hmit-api/src/main/resources/mapper/serviceOrder/PensionOrganizationDao.xml

@@ -7,11 +7,9 @@
         <result property="id" column="id"/>
         <result property="name" column="name"/>
         <result property="icon" column="icon"/>
-        <result property="serviceId" column="service_id"/>
+        <result property="description" column="description"/>
         <result property="creator" column="creator"/>
         <result property="createDate" column="create_date"/>
-        <result property="updater" column="updater"/>
-        <result property="updateDate" column="update_date"/>
     </resultMap>
 
 

hmit-api/src/main/resources/mapper/serviceOrder/PensionOrganizationServiceDao.xml

@@ -9,8 +9,6 @@
         <result property="serviceId" column="service_id"/>
         <result property="creator" column="creator"/>
         <result property="createDate" column="create_date"/>
-        <result property="updater" column="updater"/>
-        <result property="updateDate" column="update_date"/>
     </resultMap>