Merge remote-tracking branch 'origin_elink/master'

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java

@@ -1077,4 +1077,39 @@ public class DateUtils {
         calendar.add(Calendar.DAY_OF_MONTH, day);
         return calendar.getTime();
     }
+
+
+    /**
+     * @Description  获取自定义周几对应的日期
+     * 例：num=7，str="1,2" 表示获取未来周天周一出现的日期，两个总共出现七次，
+     * 比如今天1号是周一则得到的值是1号7号8号14号15号21号22号7次的日期
+     */
+    public static List<String> getCustomDay(Date startDate, int num, String str) {
+        List<String> result = new ArrayList<>();
+        Calendar rightNow = Calendar.getInstance();
+        rightNow.setTime(startDate);
+        rightNow.add(Calendar.DATE,-1);
+        startDate = rightNow.getTime();
+        Date tomorrow;
+        Integer tag = 1;
+        while (tag <= num){
+            tomorrow = getTomorrow(startDate);
+            // 返回周末
+            if (isContain(tomorrow, str)) {
+                result.add(new SimpleDateFormat(DATE_PATTERN).format(tomorrow));
+                tag++;
+            }
+            startDate = tomorrow;
+        }
+        return result;
+    }
+    /**
+     * @Description  判断日期对应的周几在字符串是否包含
+     * 例：当前时间为22.11.28为周一对应是一周的第二天，判断2在str字符串是否包含
+     */
+    private static boolean isContain(Date date, String str) {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(date);
+        return str.contains(String.valueOf(cal.get(Calendar.DAY_OF_WEEK)));
+    }
 }

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

@@ -21,6 +21,11 @@ public class ServiceRecordV2DetailResultDTO implements Serializable {
 
     private String serviceName;
     private String policyId;
+    /**
+     * 政策标题
+     * 详情接口返回
+     */
+    private String policyTitle;
 
     /**
      * 服务组织类型

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPolicyDao.java

@@ -31,4 +31,6 @@ public interface IcPolicyDao extends BaseDao<IcPolicyEntity> {
                                  @Param("title")String title,
                                  @Param("content")String content,
                                  @Param("expiredFlag")String expiredFlag);
+
+    String selectTitle(String policyId);
 }

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

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
@@ -16,10 +17,7 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.SpringContextUtils;
 import com.epmet.constant.SmsTemplateConstant;
-import com.epmet.dao.IcServiceFeedbackV2Dao;
-import com.epmet.dao.IcServiceRecordV2Dao;
-import com.epmet.dao.IcServiceScopeDao;
-import com.epmet.dao.IcServiceScopeV2Dao;
+import com.epmet.dao.*;
 import com.epmet.dto.IcServiceFeedbackV2DTO;
 import com.epmet.dto.IcServiceRecordV2DTO;
 import com.epmet.dto.IcServiceScopeV2DTO;
@@ -72,6 +70,9 @@ public class IcServiceRecordV2ServiceImpl extends BaseServiceImpl<IcServiceRecor
     private IcServiceScopeV2Dao icServiceScopeV2Dao;
     @Autowired
     private EpmetMessageOpenFeignClient messageOpenFeignClient;
+    @Autowired
+    private IcPolicyDao icPolicyDao;
+
 
     @Override
     public PageData<IcServiceRecordV2DTO> page(Map<String, Object> params) {
@@ -271,6 +272,7 @@ public class IcServiceRecordV2ServiceImpl extends BaseServiceImpl<IcServiceRecor
         result.setGridIdList(scopeV2DTOS);
         IcServiceFeedbackV2DTO feedbackV2 = serviceFeedbackV2Dao.getFeedbackV2(formDTO.getServiceRecordId());
         result.setFeedback(feedbackV2);
+        result.setPolicyTitle(StringUtils.isNotBlank(result.getPolicyId()) ? icPolicyDao.selectTitle(result.getPolicyId()) : StrConstant.EPMETY_STR);
         return result;
     }
 

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

@@ -80,4 +80,13 @@
         </if>
         order by ip.CREATED_TIME desc
      </select>
+
+    <select id="selectTitle" parameterType="java.lang.String" resultType="java.lang.String">
+        SELECT
+            p.TITLE
+        FROM
+            ic_policy p
+        WHERE
+            p.id = #{policyId}
+    </select>
 </mapper>

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPartyServiceCenterMatterDTO.java

@@ -50,10 +50,15 @@ public class IcPartyServiceCenterMatterDTO implements Serializable {
 	private String matterName;
 
     /**
-     * 预约类型，每天：everyDay，工作日：workDay，周末：weekend
+     * 预约类型，每天：everyDay，工作日：workDay，周末：weekend 自定义：custom
      */
 	private String appointmentType;
 
+    /**
+     * 类型为自定义时选择的周一~周末的时间（1-7逗号分割）
+     */
+    private String customDay;
+
     /**
      * 可预约开始时间
      */

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/MatterListDTO.java

@@ -40,6 +40,8 @@ public class MatterListDTO implements Serializable {
 
     private String matterImg;
 
+    private String customDay;
+
     public MatterListDTO() {
         this.sort = NumConstant.ZERO;
         this.matterName = "";

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AllMattersResultDTO.java

@@ -52,6 +52,11 @@ public class AllMattersResultDTO implements Serializable {
      */
     private String appointmentType;
 
+    /**
+     * 类型为自定义时选择的周一~周末的时间（1-7逗号分割）
+     */
+    private String customDay;
+
     public AllMattersResultDTO() {
         this.matterName = "";
         this.allowTime = "";

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AppointmentRecordResultDTO.java

@@ -45,6 +45,11 @@ public class AppointmentRecordResultDTO implements Serializable {
      */
     private String matterImg;
 
+    /**
+     * 类型为自定义时选择的周一~周末的时间（1-7逗号分割）
+     */
+    private String customDay;
+
     /**
      * 是否能取消预约 true：能，false：不能
      */

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/PartyServiceCenterConstant.java

@@ -16,5 +16,6 @@ public interface PartyServiceCenterConstant {
     String APPOINTMENT_TYPE_EVERY_DAY = "everyDay";
     String APPOINTMENT_TYPE_WORK_DAY = "workDay";
     String APPOINTMENT_TYPE_WEEKEND = "weekend";
+    String APPOINTMENT_TYPE_CUSTOM = "custom";
 
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPartyServiceCenterMatterEntity.java

@@ -46,10 +46,15 @@ public class IcPartyServiceCenterMatterEntity extends BaseEpmetEntity {
 	private String matterName;
 
     /**
-     * 预约类型，每天：everyDay，工作日：workDay，周末：weekend
+     * 预约类型，每天：everyDay，工作日：workDay，周末：weekend  自定义：custom
      */
 	private String appointmentType;
 
+    /**
+     * 类型为自定义时选择的周一~周末的时间（1-7逗号分割）
+     */
+	private String customDay;
+
     /**
      * 可预约开始时间
      */

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPartyServiceCenterServiceImpl.java

@@ -327,7 +327,7 @@ public class IcPartyServiceCenterServiceImpl extends BaseServiceImpl<IcPartyServ
         if (null == entity){
             throw new EpmetException("不存在此预约事项");
         }
-        List<String> dateList = getDateList(entity.getAppointmentType());
+        List<String> dateList = getDateList(entity.getAppointmentType(), entity.getCustomDay());
         Boolean s = false;
         for (String d : dateList) {
             if (d.equals(formDTO.getAppointmentDate())){
@@ -388,7 +388,7 @@ public class IcPartyServiceCenterServiceImpl extends BaseServiceImpl<IcPartyServ
         if (null == entity){
             throw new EpmetException("不存在此预约事项");
         }
-        List<String> dateList = getDateList(entity.getAppointmentType());
+        List<String> dateList = getDateList(entity.getAppointmentType(), entity.getCustomDay());
         Boolean s = false;
         for (String d : dateList) {
             if (d.equals(formDTO.getAppointmentDate())){
@@ -499,7 +499,7 @@ public class IcPartyServiceCenterServiceImpl extends BaseServiceImpl<IcPartyServ
             throw new RenException("事项不存在...");
         }
         result.setAppointmentType(matter.getAppointmentType());
-        result.setDateList(getDateList(result.getAppointmentType()));
+        result.setDateList(getDateList(result.getAppointmentType(), matter.getCustomDay()));
         LambdaQueryWrapper<IcMatterAppointmentRecordEntity> l = new LambdaQueryWrapper<>();
         l.eq(IcMatterAppointmentRecordEntity::getMatterId,formDTO.getMatterId())
                 .eq(IcMatterAppointmentRecordEntity::getAppointmentDate,formDTO.getDate())
@@ -564,14 +564,16 @@ public class IcPartyServiceCenterServiceImpl extends BaseServiceImpl<IcPartyServ
         return result;
     }
 
-    public List<String> getDateList(String type) {
+    public List<String> getDateList(String type, String customDay) {
         List<String> result = new ArrayList<>();
         if (type.equals(PartyServiceCenterConstant.APPOINTMENT_TYPE_EVERY_DAY)){
             result = DateUtils.getEveryDayList(new Date(),NumConstant.SEVEN);
         }else if (type.equals(PartyServiceCenterConstant.APPOINTMENT_TYPE_WORK_DAY)){
             result = DateUtils.getWorkDayList(new Date(),NumConstant.SEVEN);
-        }else {
+        }else if (type.equals(PartyServiceCenterConstant.APPOINTMENT_TYPE_WEEKEND)){
             result = DateUtils.getWeekendDayList(new Date(),NumConstant.SEVEN);
+        }else if (type.equals(PartyServiceCenterConstant.APPOINTMENT_TYPE_CUSTOM)){
+            result = DateUtils.getCustomDay(new Date(),NumConstant.SEVEN, customDay);
         }
         return result;
     }

epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.47__alter_ic_party_service_center_matter.sql

@@ -0,0 +1,7 @@
+
+ALTER TABLE `ic_party_service_center_matter`
+MODIFY COLUMN `APPOINTMENT_TYPE`  varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '预约类型，每天：everyDay，工作日：workDay，周末：weekend , 自定义：custom' AFTER `MATTER_NAME`,
+ADD COLUMN `CUSTOM_DAY`  varchar(32) NULL COMMENT '类型为自定义时选择的周一~周末的时间（1-7逗号分割）周日：1;周一2;周二3;周三4;周四5;周五6;周六7' AFTER `APPOINTMENT_TYPE`;
+
+
+

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcMatterAppointmentRecordDao.xml

@@ -63,7 +63,8 @@
             ar.MATTER_ID as matterId,
             c.CENTER_NAME,
             c.ADDRESS,
-            cm.MATTER_IMG
+            cm.MATTER_IMG,
+            cm.CUSTOM_DAY as customDay
         FROM ic_matter_appointment_record ar
         LEFT JOIN ic_party_service_center_matter cm ON (cm.ID = ar.MATTER_ID AND cm.DEL_FLAG = 0)
         LEFT JOIN ic_party_service_center c ON (c.ID = cm.PARTY_SERVICE_CENTER_ID AND c.DEL_FLAG = 0)

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPartyServiceCenterDao.xml

@@ -27,8 +27,10 @@
             case when cm.APPOINTMENT_TYPE = 'everyDay' THEN CONCAT('每天',' ', cm.START_TIME,'-',cm.END_TIME)
                  when cm.APPOINTMENT_TYPE = 'workDay' THEN CONCAT('工作日',' ', cm.START_TIME,'-',cm.END_TIME)
                  when cm.APPOINTMENT_TYPE = 'weekend' THEN CONCAT('周末',' ', cm.START_TIME,'-',cm.END_TIME)
+                 when cm.APPOINTMENT_TYPE = 'custom' THEN CONCAT('自定义',' ', cm.START_TIME,'-',cm.END_TIME)
                  ELSE CONCAT(cm.START_TIME,'-',cm.END_TIME) END AS allowTime,
-            IFNULL(cm.MATTER_IMG,'') AS matterImg
+            IFNULL(cm.MATTER_IMG,'') AS matterImg,
+            cm.custom_day AS customDay
         from ic_party_service_center_matter cm
         where del_flag = 0
             and PARTY_SERVICE_CENTER_ID = #{partyServiceCenterId}
@@ -60,12 +62,14 @@
             case when cm.APPOINTMENT_TYPE = 'everyDay' THEN CONCAT('每天',' ', cm.START_TIME,'-',cm.END_TIME)
                  when cm.APPOINTMENT_TYPE = 'workDay' THEN CONCAT('工作日',' ', cm.START_TIME,'-',cm.END_TIME)
                  when cm.APPOINTMENT_TYPE = 'weekend' THEN CONCAT('周末',' ', cm.START_TIME,'-',cm.END_TIME)
+                 when cm.APPOINTMENT_TYPE = 'custom' THEN CONCAT('自定义',' ', cm.START_TIME,'-',cm.END_TIME)
                  ELSE CONCAT(cm.START_TIME,'-',cm.END_TIME) END AS allowTime,
             IFNULL(cm.MATTER_IMG,'') AS matterImg,
             c.ADDRESS,
             c.WORK_PHONE,
             c.CENTER_NAME,
-            cm.APPOINTMENT_TYPE as appointmentType
+            cm.APPOINTMENT_TYPE as appointmentType,
+            cm.CUSTOM_DAY as customDay
         FROM ic_party_service_center c
         INNER JOIN ic_party_service_center_matter cm ON (cm.PARTY_SERVICE_CENTER_ID = c.ID AND cm.DEL_FLAG = 0)
             AND c.DEL_FLAG = 0

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java

@@ -1846,6 +1846,7 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 		articleEntity.setOrgId(staffInfo.getAgencyId());
 		articleEntity.setOrgIdPath(StringUtils.isBlank(agencyInfo.getPids()) || agencyInfo.getPids().equals(NumConstant.ZERO_STR) ? agencyInfo.getId() : agencyInfo.getPids().concat(":").concat(agencyInfo.getId()));
 		articleEntity.setRichTextFlag(NumConstant.ONE_STR);
+		articleEntity.setIsTop(formDTO.getIsTop());
 		baseDao.updateById(articleEntity);
 		// 2.内容
 		ArticleContentEntity articleContent = articleContentDao.selectByArticleId(formDTO.getArticleId());

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcIndividualCategoryManageServiceImpl.java

@@ -105,6 +105,8 @@ public class IcIndividualCategoryManageServiceImpl extends BaseServiceImpl<IcInd
     @Override
     public List<IndividualCategoryAllListResultDTO> individualCategoryAllList(TokenDto tokenDto) {
         IcResiCategoryStatsConfigFormDTO formDTO = new IcResiCategoryStatsConfigFormDTO();
+        //只查状态展示的
+        formDTO.setStatus("show");
         Result<List<IcResiCategoryStatsConfigDTO>> listResult = operCustomizeOpenFeignClient.resiCategoryStatsListShowd(formDTO);
         if (!listResult.success()){
             throw new EpmetException("查询客户下的人员类别失败...");

epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcIndividualCategoryManageDao.xml

@@ -22,6 +22,7 @@
         INNER JOIN ic_resi_category_warn_config wc ON (sc.COLUMN_NAME = wc.COLUMN_NAME AND wc.DEL_FLAG = '0' AND wc.CUSTOMER_ID = sc.CUSTOMER_ID)
         WHERE cm.DEL_FLAG = 0
           AND cm.USER_ID = #{userId}
+          AND sc.STATUS = 'show'
         ORDER BY cm.sort
     </select>
 </mapper>

epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncConfigDao.xml

@@ -31,26 +31,26 @@
     </resultMap>
     <select id="list" resultMap="dataConfigList">
         SELECT
-            ID AS id,
-            DEPT_CODE AS deptCode,
-            DEPT_NAME AS deptName,
-            DATA_NAME AS dataName,
-            switch_status AS switchStatus,
-            sort AS sort,
-            data_code AS dataCode,
-            customer_id as customerId
-        FROM data_sync_config
-        WHERE DEL_FLAG = 0
+            c.ID AS id,
+            c.DEPT_CODE AS deptCode,
+            c.DEPT_NAME AS deptName,
+            c.DATA_NAME AS dataName,
+            c.switch_status AS switchStatus,
+            c.sort AS sort,
+            c.data_code AS dataCode,
+            c.customer_id as customerId
+        FROM data_sync_config c
+        WHERE c.DEL_FLAG = 0
         <if test="switchStatus != null and switchStatus != ''">
-            AND switch_status = #{switchStatus}
+            AND c.switch_status = #{switchStatus}
         </if>
         <if test='null != customerId and customerId != "" '>
-            AND CUSTOMER_ID = #{customerId}
+            AND c.CUSTOMER_ID = #{customerId}
         </if>
         <if test="dataCode != null and dataCode != ''">
-            AND data_code = #{dataCode}
+            AND c.data_code = #{dataCode}
         </if>
-        order by sort
+        order by CONVERT(c.DEPT_NAME USING gbk),c.sort asc
     </select>
 
     <!-- 范围查询 -->