Merge branch 'dev'

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml

@@ -193,7 +193,11 @@
 
     <select id="selectRankList" resultType="com.epmet.evaluationindex.screen.dto.result.IndexAdvanceBranchRankResultDTO">
         SELECT
-            dm.org_name AS "name",
+            CONCAT(
+                (select agency_name from screen_customer_agency where agency_id = rd.parent_id),
+                '-',
+                dm.org_name
+            )AS "name",
             dm.index_total AS "totalScore",
             rd.party_total AS "partyMemberNum",
             rd.issue_total AS "issueNum",

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/TemplateListV2FormDTO.java

@@ -0,0 +1,20 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @description:
+ * @author: liushaowen
+ * @date: 2020/12/29 13:20
+ */
+@Data
+public class TemplateListV2FormDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+    @NotBlank(message = "customerId不能为空")
+    private String customerId;
+    @NotBlank(message = "app不能为空")
+    private String app;
+}

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/TemplateListV2ResultDTO.java

@@ -0,0 +1,21 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @description:
+ * @author: liushaowen
+ * @date: 2020/12/29 13:19
+ */
+@Data
+public class TemplateListV2ResultDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+    //类型id
+    private String tid;
+    //类型名称
+    private String type;
+
+    private String templateId;
+}

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PersonalTemplateController.java

@@ -4,8 +4,10 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.form.CustomerTemplateListFormDTO;
 import com.epmet.dto.form.GetTemplateListFormDTO;
+import com.epmet.dto.form.TemplateListV2FormDTO;
 import com.epmet.dto.result.CustomerTemplateListResultDTO;
 import com.epmet.dto.result.GetTemplateListResultDTO;
+import com.epmet.dto.result.TemplateListV2ResultDTO;
 import com.epmet.service.PersonalTemplateService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -37,6 +39,12 @@ public class PersonalTemplateController {
         return new Result<List<GetTemplateListResultDTO>>().ok(personalTemplateService.templateList(formDTO));
     }
 
+    @PostMapping("templatelistv2")
+    public Result<List<TemplateListV2ResultDTO>> templateList(@RequestBody TemplateListV2FormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO);
+        return new Result<List<TemplateListV2ResultDTO>>().ok(personalTemplateService.templateListV2(formDTO));
+    }
+
     /**
      * @return
      * @Description 获取客户两个端站内信模板Id

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PersonalTemplateDao.java

@@ -21,10 +21,8 @@ import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.PersonalTemplateDTO;
 import com.epmet.dto.form.CustomerTemplateListFormDTO;
 import com.epmet.dto.form.GetTemplateListFormDTO;
-import com.epmet.dto.result.CustomerTempResultDTO;
+import com.epmet.dto.form.TemplateListV2FormDTO;
-import com.epmet.dto.result.CustomerTemplateListResultDTO;
+import com.epmet.dto.result.*;
-import com.epmet.dto.result.GetTemplateListResultDTO;
-import com.epmet.dto.result.TemplateDTO;
 import com.epmet.entity.PersonalTemplateEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -105,4 +103,6 @@ public interface PersonalTemplateDao extends BaseDao<PersonalTemplateEntity> {
      * @return java.util.List<com.epmet.dto.PersonalTemplateDTO>
      */
 	List<PersonalTemplateDTO> selectListByKey(@Param("appId") String appId, @Param("tid") String tid, @Param("keyIds") String keyIds);
+
+	List<TemplateListV2ResultDTO> selectTemplateListV2(TemplateListV2FormDTO formDTO);
 }

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/PersonalTemplateService.java

@@ -22,9 +22,11 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.PersonalTemplateDTO;
 import com.epmet.dto.form.CustomerTemplateListFormDTO;
 import com.epmet.dto.form.GetTemplateListFormDTO;
+import com.epmet.dto.form.TemplateListV2FormDTO;
 import com.epmet.dto.result.CustomerTemplateListResultDTO;
 import com.epmet.dto.result.GetTemplateListResultDTO;
 import com.epmet.dto.result.TemplateDTO;
+import com.epmet.dto.result.TemplateListV2ResultDTO;
 import com.epmet.entity.PersonalTemplateEntity;
 
 import java.util.List;
@@ -152,4 +154,6 @@ public interface PersonalTemplateService extends BaseService<PersonalTemplateEnt
      * @return java.util.List<com.epmet.dto.PersonalTemplateDTO>
      */
 	List<PersonalTemplateDTO> getListByKey(String appId, String tid, String keyIds);
+
+	List<TemplateListV2ResultDTO> templateListV2(TemplateListV2FormDTO formDTO);
 }

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PersonalTemplateServiceImpl.java

@@ -27,9 +27,11 @@ import com.epmet.dao.PersonalTemplateDao;
 import com.epmet.dto.PersonalTemplateDTO;
 import com.epmet.dto.form.CustomerTemplateListFormDTO;
 import com.epmet.dto.form.GetTemplateListFormDTO;
+import com.epmet.dto.form.TemplateListV2FormDTO;
 import com.epmet.dto.result.CustomerTemplateListResultDTO;
 import com.epmet.dto.result.GetTemplateListResultDTO;
 import com.epmet.dto.result.TemplateDTO;
+import com.epmet.dto.result.TemplateListV2ResultDTO;
 import com.epmet.entity.PersonalTemplateEntity;
 import com.epmet.service.PersonalTemplateService;
 import org.apache.commons.lang3.StringUtils;
@@ -158,4 +160,9 @@ public class PersonalTemplateServiceImpl extends BaseServiceImpl<PersonalTemplat
         return baseDao.selectListByKey(appId, tid, keyIds);
     }
 
+
+    @Override
+    public List<TemplateListV2ResultDTO> templateListV2(TemplateListV2FormDTO formDTO) {
+        return baseDao.selectTemplateListV2(formDTO);
+    }
 }

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/enums/WxMaErrorMsgEnum.java

@@ -551,6 +551,8 @@ public enum WxMaErrorMsgEnum {
 
     CODE_200021(200021, "场景描述 sceneDesc 参数错误"),
 
+    CODE_200022(200022, "该模板已存在"),
+
     CODE_20002(20002, "商品id不存在"),
     CODE_1003(1003, "POST参数非法"),
     CODE_40005(40005, "上传素材文件格式不对"),

epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PersonalTemplateDao.xml

@@ -35,6 +35,7 @@
         FROM personal_template
         WHERE DEL_FLAG = '0'
           AND APP_ID = #{appId}
+        ORDER BY CREATED_TIME DESC
     </select>
     <select id="selectSetTemp" resultType="com.epmet.dto.PersonalTemplateDTO">
         SELECT ID,
@@ -115,4 +116,20 @@
           AND KEY_IDS = #{keyIds}
     </select>
 
+    <select id="selectTemplateListV2" resultType="com.epmet.dto.result.TemplateListV2ResultDTO">
+        SELECT
+        tid as "tid",
+        title AS "type",
+        pri_tmpl_id AS "templateId"
+        FROM
+        personal_template
+        WHERE
+        del_flag = '0'
+        AND customer_id = #{customerId}
+        AND client_type = #{app}
+        AND (
+        (KEY_IDS = '5,7,6' and tid = '8171')or
+        (KEY_IDS = '4,9,3' and tid = '2092'))
+        ORDER BY created_time ASC
+    </select>
 </mapper>