社会组织调整第二版

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

@@ -24,7 +24,6 @@ import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -78,16 +77,19 @@ public class AddSocietyOrgFormDTO implements Serializable {
     @NotBlank(message = "负责人电话不能为空", groups = { AddSocietyOrgFormDTO.Add.class })
     @Length(max = 11, message = "负责人电话不能超过11个字符",groups = {Add.class})
 	private String mobile;
+    /**
+     * 服务时间
+     */
+    @NotBlank(message = "服务时间不能为空", groups = { AddSocietyOrgFormDTO.Add.class })
+    private String serviceTimeStr;
     /**
      * 起始服务时间
      */
-    @NotNull(message = "起始服务时间不能为空", groups = { AddSocietyOrgFormDTO.Add.class })
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
 	private Date serviceStartTime;
     /**
      * 终止服务时间
      */
-    @NotNull(message = "终止服务时间不能为空", groups = { AddSocietyOrgFormDTO.Add.class })
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
 	private Date serviceEndTime;
     /**

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

@@ -67,6 +67,12 @@ public class EditSocietyOrgFormDTO implements Serializable {
      */
     @Length(max = 11, message = "负责人电话不能超过11个字符",groups = {Edit.class})
 	private String mobile;
+
+    /**
+     * 服务时间
+     */
+    @NotBlank(message = "服务时间不能为空",groups = {Edit.class})
+    private String serviceTimeStr;
     /**
      * 起始服务时间
      */

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/GetListSocietyOrgResultDTO.java

@@ -56,6 +56,10 @@ public class GetListSocietyOrgResultDTO implements Serializable {
         private String personInCharge;
         //负责人电话
         private String mobile;
+        /**
+         * 服务时间
+         */
+        private String serviceTimeStr;
         //起始服务时间
         @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
         private Date serviceStartTime;

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/SocietyOrgListResultDTO.java

@@ -47,6 +47,10 @@ public class SocietyOrgListResultDTO implements Serializable {
     private String personInCharge;
     //负责人电话
     private String mobile;
+    /**
+     * 服务时间
+     */
+    private String serviceTimeStr;
     //起始服务时间
     //@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     //private Date serviceStartTime;

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcSocietyOrgEntity.java

@@ -73,6 +73,11 @@ public class IcSocietyOrgEntity extends BaseEpmetEntity {
 	private String mobile;
 
     /**
+     * 服务时间
+     */
+	private String serviceTimeStr;
+
+	/**
      * 起始服务时间
      */
 	private Date serviceStartTime;

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

@@ -131,7 +131,9 @@ public class IcSocietyOrgServiceImpl extends BaseServiceImpl<IcSocietyOrgDao, Ic
         CustomerStaffInfoCacheResult staffInfoCache = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId());
         //2022.1.7 应产品要求 当前组织只能看到自己组织添加的社会组织数据，不允许看其他下级的
         //formDTO.setPids(staffInfoCache.getAgencyPIds());
-        formDTO.setAgencyId(staffInfoCache.getAgencyId());
+        if(StringUtils.isBlank(formDTO.getAgencyId())){
+            formDTO.setAgencyId(staffInfoCache.getAgencyId());
+        }
         //1.根据查询条件分页查询社会组织数据
         PageInfo<SocietyOrgListResultDTO> result =
                 PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()).doSelectPageInfo(() -> baseDao.getList(formDTO));

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

@@ -12,6 +12,7 @@
             service_matters serviceMatters,
             person_in_charge personInCharge,
             mobile mobile,
+            service_time_str,
             service_start_time serviceStartTime,
             service_end_time serviceEndTime,
             admin_staff_id adminStaffId,