社会组织调整

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

@@ -23,6 +23,7 @@ import lombok.Data;
 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;
@@ -48,6 +49,11 @@ public class AddSocietyOrgFormDTO implements Serializable {
      * agency_id的所有上级
      */
 	private String pids;
+    /**
+     * 社会组织头像
+     */
+    @NotEmpty(message = "组织头像不能为空", groups = { AddSocietyOrgFormDTO.Add.class})
+    private String[] imageList;
     /**
      * 社会组织名称
      */
@@ -87,7 +93,6 @@ public class AddSocietyOrgFormDTO implements Serializable {
     /**
      * 绑定管理员[组织下录入的工作人员]
      */
-    @NotBlank(message = "绑定管理员名称不能为空", groups = { AddSocietyOrgFormDTO.Add.class })
 	private String adminStaffId;
     /**
      * 地址

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

@@ -22,6 +22,7 @@ import lombok.Data;
 import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -40,6 +41,12 @@ public class EditSocietyOrgFormDTO implements Serializable {
      */
     @NotBlank(message = "社会组织Id不能为空", groups = { Edit.class, Del.class })
 	private String societyId;
+
+    /**
+     * 社会组织头像
+     */
+    @NotEmpty(message = "组织头像不能为空", groups = { Edit.class})
+    private String[] imageList;
     /**
      * 社会组织名称
      */

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

@@ -44,6 +44,10 @@ public class GetListSocietyOrgResultDTO implements Serializable {
         private String  agencyId;
         //社会组织Id
         private String societyId;
+        /**
+         * 社会组织头像
+         */
+        private String imgUrl;
         //社会组织名称
         private String societyName;
         //服务事项

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

@@ -35,6 +35,10 @@ public class SocietyOrgListResultDTO implements Serializable {
     private String  agencyName;
     //社会组织Id
     private String societyId;
+    /**
+     * 图像
+     */
+    private String imgUrl;
     //社会组织名称
     private String societyName;
     //服务事项

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

@@ -87,6 +87,10 @@ public class IcSocietyOrgEntity extends BaseEpmetEntity {
      */
 	private String adminStaffId;
 
+	/**
+	 * 地址
+	 */
+	private String imgUrl;
     /**
      * 地址
      */

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

@@ -80,6 +80,10 @@ public class IcSocietyOrgServiceImpl extends BaseServiceImpl<IcSocietyOrgDao, Ic
     @Transactional(rollbackFor = Exception.class)
     public void add(AddSocietyOrgFormDTO dto) {
         IcSocietyOrgEntity entity = ConvertUtils.sourceToTarget(dto, IcSocietyOrgEntity.class);
+        //图片必填
+        if(dto.getImageList() != null&& StringUtils.isNotBlank(dto.getImageList()[0])){
+            entity.setImgUrl(dto.getImageList()[0]);
+        }
         CustomerStaffInfoCacheResult staffInfoCache = CustomerStaffRedis.getStaffInfo(dto.getCustomerId(), dto.getStaffId());
         entity.setAgencyId(staffInfoCache.getAgencyId());
         entity.setPids(staffInfoCache.getAgencyPIds());
@@ -96,6 +100,10 @@ public class IcSocietyOrgServiceImpl extends BaseServiceImpl<IcSocietyOrgDao, Ic
         if (null == entity) {
             throw new RenException(String.format("修改社会组织信息失败，社会组织信息不存在，组织Id->%s", formDTO.getSocietyId()));
         }
+        //图片必填
+        if(formDTO.getImageList() != null&& StringUtils.isNotBlank(formDTO.getImageList()[0])){
+            entity.setImgUrl(formDTO.getImageList()[0]);
+        }
         entity = ConvertUtils.sourceToTarget(formDTO, IcSocietyOrgEntity.class);
         entity.setId(formDTO.getSocietyId());
         baseDao.updateById(entity);
@@ -115,7 +123,8 @@ public class IcSocietyOrgServiceImpl extends BaseServiceImpl<IcSocietyOrgDao, Ic
     /**
      * @Author sun
      * @Description 社会组织列表查询
-     **/
+     *
+     * @return*/
     @Override
     public GetListSocietyOrgResultDTO getList(GetListSocietyOrgFormDTO formDTO) {
         GetListSocietyOrgResultDTO resultDTO = new GetListSocietyOrgResultDTO();

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

@@ -7,6 +7,7 @@
         SELECT
             agency_id agencyId,
             id societyId,
+            img_url,
             society_name societyName,
             service_matters serviceMatters,
             person_in_charge personInCharge,