Merge remote-tracking branch 'origin/dev_icservice' into dev_icservice

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/ServiceProjectFeedbackFormDTO.java

@@ -2,6 +2,7 @@ package com.epmet.dto.form;
 
 import lombok.Data;
 
+import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
 import java.util.List;
 
@@ -37,6 +38,8 @@ public class ServiceProjectFeedbackFormDTO {
     private String longitude;
     private String latitude;
     private String address;
+
+    @Valid
     private List<Attachment> attachmentList;
 
     @Data

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/ServiceProjectRecordFormDTO.java

@@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
@@ -56,6 +57,7 @@ public class ServiceProjectRecordFormDTO {
      */
     private String remark;
 
+    @Valid
     private ServiceProjectFeedbackFormDTO feedback;
 
     private Integer pageNo = 1;

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcServiceProjectController.java

@@ -206,7 +206,7 @@ public class IcServiceProjectController {
     @PostMapping("/service/initiate")
     public Result initiateService(@RequestBody ServiceProjectRecordFormDTO input) {
 
-        ValidatorUtils.validateEntity(input, ServiceProjectRecordFormDTO.Initiate.class);
+        ValidatorUtils.validateEntity(input, ServiceProjectRecordFormDTO.Initiate.class, ServiceProjectFeedbackFormDTO.InitiateGroup.class);
         icServiceRecordService.initiateService(input);
 
         return new Result();

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceRecordServiceImpl.java

@@ -188,7 +188,13 @@ public class IcServiceRecordServiceImpl extends BaseServiceImpl<IcServiceRecordD
         serviceRecord.setPrincipalContact(input.getPrincipalContact());
         serviceRecord.setServiceTimeStart(input.getServiceTimeStart());
         serviceRecord.setServiceTimeEnd(input.getServiceTimeEnd());
-        serviceRecord.setServiceStatus(feedbackDto.getServiceStatus());
+        if (feedbackDto == null) {
+            // 没写反馈，给一个服务中
+            serviceRecord.setServiceStatus("in_service");
+        } else {
+            // 写了反馈，按照反馈的来
+            serviceRecord.setServiceStatus(feedbackDto.getServiceStatus());
+        }
         serviceRecord.setRemark(input.getRemark());
 
         baseDao.insert(serviceRecord);

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.17__ic_service_project.sql

@@ -40,4 +40,28 @@ CREATE TABLE `ic_service_project_attachment` (
                                                  `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人',
                                                  `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
                                                  PRIMARY KEY (`ID`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT COMMENT='事件附件表';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT COMMENT='事件附件表';
+
+CREATE TABLE `ic_service_org` (
+  `ID` varchar(64) NOT NULL COMMENT 'ID',
+  `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id',
+  `AGENCY_ID` varchar(64) NOT NULL COMMENT '所属组织机构Id',
+  `AGENCY_ID_PATH` varchar(256) NOT NULL COMMENT 'agencyId的所有上级，包含自己',
+  `SERVICE_TYPE` varchar(64) NOT NULL COMMENT '服务类别【字典表 ic_service_type】多个值逗号分隔',
+  `ORG_NAME` varchar(64) NOT NULL COMMENT '服务组织名称',
+  `ORG_DESCRIBE` varchar(512) DEFAULT NULL COMMENT '组织描述',
+  `PRINCIPAL_NAME` varchar(64) NOT NULL COMMENT '负责人姓名',
+  `PRINCIPAL_MOBILE` varchar(11) NOT NULL COMMENT '负责人电话',
+  `LONGITUDE` varchar(64) DEFAULT NULL COMMENT '经度',
+  `LATITUDE` varchar(64) DEFAULT NULL COMMENT '纬度',
+  `ADDRESS` varchar(256) DEFAULT NULL COMMENT '地址',
+  `REMARK` varchar(512) DEFAULT NULL COMMENT '备注',
+  `DEL_FLAG` varchar(1) NOT NULL COMMENT '删除标识',
+  `REVISION` int(10) NOT NULL COMMENT '乐观锁',
+  `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人',
+  `CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
+  `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人',
+  `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
+  PRIMARY KEY (`ID`) USING BTREE,
+  KEY `idx_pid` (`AGENCY_ID`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='服务组织表';

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceRecordDao.xml

@@ -37,6 +37,8 @@
         from ic_service_record record
                  left join ic_service_feedback feedback on (record.ID = feedback.SERVICE_RECORD_ID)
         <where>
+            record.DEL_FLAG = '0'
+            and feedback.DEL_FLAG = '0'
             <if test="serviceCategoryKey != null and serviceCategoryKey != ''">
                 and record.SERVICE_CATEGORY_KEY = #{serviceCategoryKey}
             </if>