优化

platform-dao/src/main/java/com/platform/dao/enums/SysConfigEnum.java

@@ -48,6 +48,7 @@ public enum SysConfigEnum {
     REPAIR_STRATEGY_MODEL("维修策略模式选择"),
     STORE_SUPER_USERS("仓库管理中的超级用户集合"),
     REPAIR_SEND_SUCCESS_WECHAT_TEMPLATE_ID("报修后通知维修主管"),
+    REPAIR_SUCCESS_WECHAT_TEMPLATE_ID("维修完成后通知工程师审核"),
     AUDIT_WECHAT_TEMPLATE_ID("审批通知"),
     PRODUCE_VERIFY_USERS("生产审核人员配置"),
     REPAIR_RECEIVE_SUCCESS_WECHAT_TEMPLATE_ID("报修接收后通知报修人"),

platform-dao/src/main/java/com/platform/dao/util/MessageTemplateUtil.java

@@ -1,7 +1,5 @@
 package com.platform.dao.util;
 
-import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.extra.template.engine.velocity.VelocityTemplate;
 import com.platform.common.exception.BusinessException;
 import com.platform.common.util.StringUtils;
 import com.platform.dao.dto.repair.RepairApplicationFormDTO;
@@ -11,7 +9,6 @@ import freemarker.template.Configuration;
 import freemarker.template.Template;
 import freemarker.template.TemplateException;
 import org.apache.velocity.VelocityContext;
-import org.apache.velocity.app.Velocity;
 import org.apache.velocity.app.VelocityEngine;
 
 import java.io.IOException;

platform-dao/src/main/java/com/platform/dao/vo/export/repair/ExportRepairApplicationFormVO.java

@@ -23,10 +23,10 @@ public class ExportRepairApplicationFormVO implements Serializable {
     @Excel(name = "报修单号", orderNum = "1")
     private String no;
     /**
-     * 设备编号
+     * 设备位号
      */
     @Excel(name = "设备位号", orderNum = "2")
-    private String sbNo;
+    private String positionNo;
 
     /**
      * 设备名称
@@ -51,18 +51,8 @@ public class ExportRepairApplicationFormVO implements Serializable {
     /**
      * 报修人id
      */
-    @Excel(name = "响应时间", orderNum = "7")
-    private Double receiveMinutes;
-    /**
-     * 设备名称
-     */
-    @Excel(name = "维修时间", orderNum = "8")
-    private Double repairMinutes;
-    /**
-     * 报修人id
-     */
-    @Excel(name = "修复时间", orderNum = "9")
-    private Double dealMinutes;
+    @Excel(name = "车间位置", orderNum = "7")
+    private String sbPositionName;
     /**
      * 报修状态: 1-待分配 2-已分配 3-已完成 4-已撤销
      */
@@ -96,7 +86,7 @@ public class ExportRepairApplicationFormVO implements Serializable {
      * 问题描述
      */
     @Excel(name = "问题描述", orderNum = "15")
-    private String problemDesc;
+    private String content;
     /**
      * 检查处理过程
      */
@@ -120,7 +110,7 @@ public class ExportRepairApplicationFormVO implements Serializable {
     private String changeRepairPlanContent;
 
     /**
-     * 故障描述
+     * 维修专业
      */
     @Excel(name = "维修专业", orderNum = "20")
     private String repairProfessor; // 维修专业

platform-rest/src/main/java/com/platform/rest/task/FillGatherTaskTask.java

@@ -250,7 +250,7 @@ public class FillGatherTaskTask {
         // 2、微信
         String wechatTemplateId = ConfigCache.getLabelByValueAllowNull(SysConfigEnum.REPAIR_NOTICE_SUCCESS_WECHAT_TEMPLATE_ID.name());
         String detailUrl = "pages/repair-detail/repair-detail?detailId=" + task.getId();
-        SendMessageUtils.sendWechatNew(ListUtils.newArrayList(user.getWxOpenId()),detailUrl,values,wechatTemplateId);
+        SendMessageUtils.sendWechatNew(ListUtils.newArrayList(user.getWxOpenId()),detailUrl,values,wechatTemplateId,1);
         // 3、短信
         SendMessageUtils.sendCommonSms(ListUtils.newArrayList(user.getPhone()),info);
     }

platform-service/src/main/java/com/platform/service/fill/impl/FillGatherTaskServiceImpl.java

@@ -653,7 +653,7 @@ public class FillGatherTaskServiceImpl extends BaseServiceImpl<FillGatherTaskMap
         // 2、微信
         String wechatTemplateId = ConfigCache.getLabelByValueAllowNull(SysConfigEnum.REPAIR_NOTICE_SUCCESS_WECHAT_TEMPLATE_ID.name());
         String detailUrl = "pages/repair-detail/repair-detail?detailId=" + task.getId();
-        SendMessageUtils.sendWechatNew(ListUtils.newArrayList(user.getWxOpenId()),detailUrl,values,wechatTemplateId);
+        SendMessageUtils.sendWechatNew(ListUtils.newArrayList(user.getWxOpenId()),detailUrl,values,wechatTemplateId,1);
         // 3、短信
         SendMessageUtils.sendCommonSms(ListUtils.newArrayList(user.getPhone()),info);
     }

platform-service/src/main/java/com/platform/service/preparation/impl/PreparationServiceImpl.java

@@ -241,7 +241,7 @@ public class PreparationServiceImpl extends BaseServiceImpl<PreparationMapper, P
         // 1、站内信
         sendWorkplaceAndEmailNew(maps.get("mails"),maps.get("userIds"),preparation.getId(),info, detailType);
         // 2、微信
-        SendMessageUtils.sendWechatNew(maps.get("openIds"),detailUrl,values,wechatTemplateId);
+        SendMessageUtils.sendWechatNew(maps.get("openIds"),detailUrl,values,wechatTemplateId,1);
         // 3、短信
         SendMessageUtils.sendCommonSms(maps.get("phones"),info);
     }
@@ -281,7 +281,7 @@ public class PreparationServiceImpl extends BaseServiceImpl<PreparationMapper, P
         // 1、站内信
         sendWorkplaceAndEmailNew(maps.get("mails"),maps.get("userIds"),preparation.getId(),info, detailType);
         // 2、微信
-        SendMessageUtils.sendWechatNew(maps.get("openIds"),detailUrl,values,wechatTemplateId);
+        SendMessageUtils.sendWechatNew(maps.get("openIds"),detailUrl,values,wechatTemplateId,1);
         // 3、短信
         SendMessageUtils.sendCommonSms(maps.get("phones"),info);
     }

platform-service/src/main/java/com/platform/service/redis/impl/RedisFillTaskService.java

@@ -121,7 +121,7 @@ public class RedisFillTaskService extends KeyExpirationEventMessageListener {
         // 2、微信
         String wechatTemplateId = ConfigCache.getLabelByValueAllowNull(SysConfigEnum.REPAIR_NOTICE_SUCCESS_WECHAT_TEMPLATE_ID.name());
         String detailUrl = "pages/repair-detail/repair-detail?detailId=" + task.getId();
-        SendMessageUtils.sendWechatNew(ListUtils.newArrayList(user.getWxOpenId()),detailUrl,values,wechatTemplateId);
+        SendMessageUtils.sendWechatNew(ListUtils.newArrayList(user.getWxOpenId()),detailUrl,values,wechatTemplateId,1);
         // 3、短信
         SendMessageUtils.sendCommonSms(ListUtils.newArrayList(user.getPhone()),info);
     }

platform-service/src/main/java/com/platform/service/repair/impl/RepairApplicationFormServiceImpl.java

@@ -5,8 +5,6 @@ import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageHelper;
-import com.mysql.cj.protocol.x.Notice;
-import com.platform.activiti.controller.ActivitiController;
 import com.platform.common.bean.DictVO;
 import com.platform.common.cache.ConfigCache;
 import com.platform.common.cache.DictCache;
@@ -26,10 +24,8 @@ import com.platform.dao.dto.sb.SbInfoDTO;
 import com.platform.dao.dto.store.InStoreFormDTO;
 import com.platform.dao.dto.store.OutStoreFormDTO;
 import com.platform.dao.dto.store.StoreCheckJobDTO;
-import com.platform.dao.dto.upms.SysDictDTO;
 import com.platform.dao.dto.upms.SysUserDTO;
 import com.platform.dao.entity.customize.CustomFieldTemplateData;
-import com.platform.dao.entity.preparation.Preparation;
 import com.platform.dao.entity.repair.RepairApplicationForm;
 import com.platform.dao.entity.repair.RepairReason;
 import com.platform.dao.entity.sb.SbInfo;
@@ -40,7 +36,9 @@ import com.platform.dao.enums.*;
 import com.platform.dao.mapper.check.CheckJobMapper;
 import com.platform.dao.mapper.customize.CustomFieldTemplateDataMapper;
 import com.platform.dao.mapper.preparation.PreparationMapper;
-import com.platform.dao.mapper.repair.*;
+import com.platform.dao.mapper.repair.RepairApplicationFormMapper;
+import com.platform.dao.mapper.repair.RepairFeeMapper;
+import com.platform.dao.mapper.repair.RepairReasonMapper;
 import com.platform.dao.mapper.sb.SbPositionMapper;
 import com.platform.dao.mapper.store.InStoreFormMapper;
 import com.platform.dao.mapper.store.OutStoreFormMapper;
@@ -69,11 +67,9 @@ import com.platform.dao.vo.sb.SbInfoVO;
 import com.platform.service.base.impl.BaseServiceImpl;
 import com.platform.service.event.WorkplaceBacklogEvent;
 import com.platform.service.repair.RepairApplicationFormService;
-import com.platform.service.repair.RepairFormService;
 import com.platform.service.sb.SbInfoService;
 import com.platform.service.upms.SysDictService;
 import com.platform.service.upms.SysFileService;
-import com.platform.service.upms.SysUserDeptService;
 import com.platform.service.upms.SysUserService;
 import com.platform.service.wechat.util.WeChatMessageUtil;
 import lombok.AllArgsConstructor;
@@ -1557,6 +1553,18 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
                 }*/
                 if (repairApplicationForm.getApplyTime().isAfter(map.get("searchStartTimeMonth")) && repairApplicationForm.getApplyTime().isBefore(map.get("searchEndTimeMonth"))) {
                     i++;
+                    // 维修专业
+                    String professor = repairApplicationForm.getRepairProfessor();
+                    if(StringUtils.isNotBlank(professor)){
+                        StringBuilder info = new StringBuilder();
+                        String[] arr = professor.split(",");
+                        for(String num : arr){
+                            String tempStr = DictCache.getLabelByValue("REPAIR_APPLICATION_PROFESSOR",Integer.parseInt(num));
+                            info.append(tempStr).append("&");
+                        }
+                        String infoStr = info.toString();
+                        repairApplicationForm.setRepairProfessor(infoStr.substring(0,infoStr.length()-1));
+                    }
                     detailList.add(repairApplicationForm);
                 }
             }

platform-service/src/main/java/com/platform/service/repair/strategy/AbstractRepairBaseStrategy.java

@@ -382,7 +382,7 @@ public abstract class AbstractRepairBaseStrategy implements RepairBaseStrategy{
      * @param values   具体信息
      * @param wechatTemplateId  微信模板ID
      */
-    public void sendWechatNew(List<String> openIds,String detailUrl,String[] values,String wechatTemplateId){
+    public void sendWechatNew(List<String> openIds,String detailUrl,String[] values,String wechatTemplateId,int templateType){
         if (CollectionUtil.isNotEmpty(openIds)) {
             String mobileDomain = ConfigCache.getLabelByValueAllowNull(SysConfigEnum.SYSTEM_DOMAIN_MOBILE.name());
             if (StringUtils.isBlank(mobileDomain)) {
@@ -394,7 +394,7 @@ public abstract class AbstractRepairBaseStrategy implements RepairBaseStrategy{
             detailUrl = mobileDomain + detailUrl;
             for (String openId : openIds) {
                 log.info("开始发送微信通知，用户openId: " + openId);
-                WeChatMessageUtil.sendWechatMessage(openId, detailUrl, values,wechatTemplateId);
+                WeChatMessageUtil.sendWechatMessage(openId, detailUrl, values,wechatTemplateId,templateType);
             }
         }
     }

platform-service/src/main/java/com/platform/service/repair/strategy/impl/LongYanPlanRepairStrategy.java

@@ -982,7 +982,7 @@ public class LongYanPlanRepairStrategy extends AbstractRepairBaseStrategy {
         sendWorkplaceAndEmailNew(ListUtils.newArrayList(user.getEmail()),
                 ListUtils.newArrayList(user.getUserId()),model.getId(),messageInfo, detailType);
         // 2、微信
-        SendMessageUtils.sendWechatNew(ListUtils.newArrayList(user.getWxOpenId()),detailUrl,values,wechatTemplateId);
+        SendMessageUtils.sendWechatNew(ListUtils.newArrayList(user.getWxOpenId()),detailUrl,values,wechatTemplateId,1);
         // 3、短信
         if(StringUtils.isNotBlank(user.getPhone()) && user.getPhone().trim().length() == 11){
             SendMessageUtils.sendCommonSms(ListUtils.newArrayList(user.getPhone()),messageInfo);
@@ -1019,7 +1019,7 @@ public class LongYanPlanRepairStrategy extends AbstractRepairBaseStrategy {
         // 1、站内信和email
         sendWorkplaceAndEmailNew(emails,userIds,model.getId(),messageInfo, detailType);
         // 2、微信
-        SendMessageUtils.sendWechatNew(openIds,detailUrl,values,wechatTemplateId);
+        SendMessageUtils.sendWechatNew(openIds,detailUrl,values,wechatTemplateId,1);
         // 3、短信
         SendMessageUtils.sendCommonSms(phones,messageInfo);
     }
@@ -1073,7 +1073,7 @@ public class LongYanPlanRepairStrategy extends AbstractRepairBaseStrategy {
         String[] values = new String[]{"你有一条维修任务!",model.getActualUser(),sbInfo.getName(),DateUtils.dateToString(model.getApplyTime()),model.getSbCph(),model.getContent(),"请知悉"};
         String wechatTemplateId = ConfigCache.getLabelByValueAllowNull(SysConfigEnum.REPAIR_NOTICE_SUCCESS_WECHAT_TEMPLATE_ID.name());
         String detailUrl = "pages/service-detail/service-detail?id=" + model.getId();
-        SendMessageUtils.sendWechatNew(ListUtils.newArrayList(user.getWxOpenId()),detailUrl,values,wechatTemplateId);
+        SendMessageUtils.sendWechatNew(ListUtils.newArrayList(user.getWxOpenId()),detailUrl,values,wechatTemplateId,1);
         // 3、短信
         SendMessageUtils.sendCommonSms(ListUtils.newArrayList(user.getPhone()),info);
     }
@@ -1126,7 +1126,7 @@ public class LongYanPlanRepairStrategy extends AbstractRepairBaseStrategy {
         // 1、站内信
         sendWorkplaceAndEmailNew(maps.get("mails"),maps.get("userIds"),form.getId(),info, detailType);
         // 2、微信
-        SendMessageUtils.sendWechatNew(maps.get("openIds"),detailUrl,values,wechatTemplateId);
+        SendMessageUtils.sendWechatNew(maps.get("openIds"),detailUrl,values,wechatTemplateId,1);
         // 3、短信
         SendMessageUtils.sendCommonSms(maps.get("phones"),info);
     }
@@ -1168,7 +1168,7 @@ public class LongYanPlanRepairStrategy extends AbstractRepairBaseStrategy {
         // 1、站内信
         sendWorkplaceAndEmailNew(ListUtils.newArrayList(userVOs.getEmail()),ListUtils.newArrayList(userVOs.getUserId()),form.getId(),info, detailType);
         // 2、微信
-        SendMessageUtils.sendWechatNew(ListUtils.newArrayList(userVOs.getWxOpenId()),detailUrl,values,wechatTemplateId);
+        SendMessageUtils.sendWechatNew(ListUtils.newArrayList(userVOs.getWxOpenId()),detailUrl,values,wechatTemplateId,1);
         // 3、短信
         SendMessageUtils.sendCommonSms(ListUtils.newArrayList(userVOs.getPhone()),info);
     }

platform-service/src/main/java/com/platform/service/repair/strategy/impl/LongYanRepairStrategy.java

@@ -1186,7 +1186,7 @@ public class LongYanRepairStrategy extends AbstractRepairBaseStrategy {
         sendWorkplaceAndEmailNew(ListUtils.newArrayList(user.getEmail()),
                 ListUtils.newArrayList(user.getUserId()),model.getId(),messageInfo, detailType);
         // 2、微信
-        SendMessageUtils.sendWechatNew(ListUtils.newArrayList(user.getWxOpenId()),detailUrl,values,wechatTemplateId);
+        SendMessageUtils.sendWechatNew(ListUtils.newArrayList(user.getWxOpenId()),detailUrl,values,wechatTemplateId,1);
         // 3、短信
         if(StringUtils.isNotBlank(user.getPhone()) && user.getPhone().trim().length() == 11){
             SendMessageUtils.sendCommonSms(ListUtils.newArrayList(user.getPhone()),messageInfo);
@@ -1242,7 +1242,7 @@ public class LongYanRepairStrategy extends AbstractRepairBaseStrategy {
         String[] values = new String[]{"你有一条维修任务!",model.getActualUser(),sbInfo.getName(),DateUtils.dateToString(model.getApplyTime()),model.getSbCph(),model.getContent(),"请知悉"};
         String wechatTemplateId = ConfigCache.getLabelByValueAllowNull(SysConfigEnum.REPAIR_NOTICE_SUCCESS_WECHAT_TEMPLATE_ID.name());
         String detailUrl = "pages/service-detail/service-detail?id=" + model.getId();
-        SendMessageUtils.sendWechatNew(ListUtils.newArrayList(user.getWxOpenId()),detailUrl,values,wechatTemplateId);
+        SendMessageUtils.sendWechatNew(ListUtils.newArrayList(user.getWxOpenId()),detailUrl,values,wechatTemplateId,1);
         // 3、短信
         SendMessageUtils.sendCommonSms(ListUtils.newArrayList(user.getPhone()),info);
     }
@@ -1272,7 +1272,7 @@ public class LongYanRepairStrategy extends AbstractRepairBaseStrategy {
         // 1、站内信和email
         sendWorkplaceAndEmailNew(emails,userIds,model.getId(),messageInfo, detailType);
         // 2、微信
-        SendMessageUtils.sendWechatNew(openIds,detailUrl,values,wechatTemplateId);
+        SendMessageUtils.sendWechatNew(openIds,detailUrl,values,wechatTemplateId,1);
         // 3、短信
         SendMessageUtils.sendCommonSms(phones,messageInfo);
     }
@@ -1290,7 +1290,8 @@ public class LongYanRepairStrategy extends AbstractRepairBaseStrategy {
                 BeanConverterUtil.copyObjectProperties(form,RepairApplicationFormDTO.class), sbInfo);
         Integer detailType = WorkplaceBacklogDetailTypeEnum.REPAIR_APPLICATION.getValue();
         String[] values = null;
-        String wechatTemplateId = ConfigCache.getLabelByValueAllowNull(SysConfigEnum.REPAIR_SEND_SUCCESS_WECHAT_TEMPLATE_ID.name());;
+        int templateType = 1;
+        String wechatTemplateId = ConfigCache.getLabelByValueAllowNull(SysConfigEnum.REPAIR_SEND_SUCCESS_WECHAT_TEMPLATE_ID.name());
         String detailUrl = "pages/service-detail/service-detail?id=" + form.getId();
         switch (type){
             case CommonConstants.CALL_REPAIR_NOTICE:
@@ -1301,7 +1302,9 @@ public class LongYanRepairStrategy extends AbstractRepairBaseStrategy {
                 detailType = WorkplaceBacklogDetailTypeEnum.REPAIR_APPLICATION_STOP.getValue();
                 break;
             case CommonConstants.REPAIR_COMPLETE_NOTICE:
-                values = new String[]{"维修完成消息！",form.getNo(),sbInfo.getName(),form.getContent(),form.getSbCph(),"请确认后，提交生产审核"};
+                templateType = 2;
+                wechatTemplateId = ConfigCache.getLabelByValueAllowNull(SysConfigEnum.REPAIR_SUCCESS_WECHAT_TEMPLATE_ID.name());
+                values = new String[]{"维修完成消息！",form.getActualUser(),form.getSbCph(),sbInfo.getName(),DateUtils.dateToString(form.getApplyTime(), DateUtils.PATTERN_YMD_HMS),"当前审核人","请确认后，尽快关闭工单"};
                 detailType = WorkplaceBacklogDetailTypeEnum.REPAIR_OK.getValue();
                 break;
             case CommonConstants.CALL_REPAIR_FAIL:
@@ -1321,7 +1324,7 @@ public class LongYanRepairStrategy extends AbstractRepairBaseStrategy {
         // 1、站内信
         sendWorkplaceAndEmailNew(maps.get("mails"),maps.get("userIds"),form.getId(),info, detailType);
         // 2、微信
-        SendMessageUtils.sendWechatNew(maps.get("openIds"),detailUrl,values,wechatTemplateId);
+        SendMessageUtils.sendWechatNew(maps.get("openIds"),detailUrl,values,wechatTemplateId,templateType);
         // 3、短信
         SendMessageUtils.sendCommonSms(maps.get("phones"),info);
     }
@@ -1354,7 +1357,7 @@ public class LongYanRepairStrategy extends AbstractRepairBaseStrategy {
         // 1、站内信
         sendWorkplaceAndEmailNew(ListUtils.newArrayList(userVOs.getEmail()),ListUtils.newArrayList(userVOs.getUserId()),form.getId(),info, detailType);
         // 2、微信
-        SendMessageUtils.sendWechatNew(ListUtils.newArrayList(userVOs.getWxOpenId()),detailUrl,values,wechatTemplateId);
+        SendMessageUtils.sendWechatNew(ListUtils.newArrayList(userVOs.getWxOpenId()),detailUrl,values,wechatTemplateId,1);
         // 3、短信
         SendMessageUtils.sendCommonSms(ListUtils.newArrayList(userVOs.getPhone()),info);
     }

platform-service/src/main/java/com/platform/service/util/SendMessageUtils.java

@@ -52,7 +52,7 @@ public class SendMessageUtils {
      * @param values   具体信息
      * @param wechatTemplateId  微信模板ID
      */
-    public static void sendWechatNew(List<String> openIds,String detailUrl,String[] values,String wechatTemplateId){
+    public static void sendWechatNew(List<String> openIds,String detailUrl,String[] values,String wechatTemplateId,int templateType){
         if (CollectionUtil.isNotEmpty(openIds)) {
             String mobileDomain = ConfigCache.getLabelByValueAllowNull(SysConfigEnum.SYSTEM_DOMAIN_MOBILE.name());
             if (StringUtils.isBlank(mobileDomain)) {
@@ -64,7 +64,7 @@ public class SendMessageUtils {
             detailUrl = mobileDomain + detailUrl;
             for (String openId : openIds) {
                 log.info("开始发送微信通知，用户openId: " + openId);
-                WeChatMessageUtil.sendWechatMessage(openId, detailUrl, values,wechatTemplateId);
+                WeChatMessageUtil.sendWechatMessage(openId, detailUrl, values,wechatTemplateId,templateType);
             }
         }
     }

platform-service/src/main/java/com/platform/service/wechat/model/request/WechatTemplateRequestBuilder.java

@@ -31,6 +31,10 @@ public class WechatTemplateRequestBuilder {
     public static String[] TEMPLATE_KEYS_REPAIR = new String[]{"first", "keyword1", "keyword2","keyword3", "keyword4", "remark"};
 
 	/**
+	 * 维修提醒模板keys 模板ID:R4Uo0XAbY3yoBKzUkuQ5MA45ekwlHlnbOih3XeVo2Rg  维修完成提醒
+	 */
+	public static String[] TEMPLATE_REPAIR_COMPLETE_KEYS_REPAIR = new String[]{"first", "keyword1", "keyword2","keyword3", "keyword4","keyword5", "remark"};
+    /**
 	 * 审批提醒模板keys 模板ID:njA6sdMf0EPi1k8iruwe2aw0miH6q-0AvB_GCEyzJpE  审批提醒
 	 */
 	public static String[] TEMPLATE_KEYS_AUDIT = new String[]{"first", "keyword1", "keyword2","keyword3", "remark"};
@@ -265,19 +269,34 @@ public class WechatTemplateRequestBuilder {
      * @param colors
      *            消息字体颜色
      */
-    public static WechatTemplateRequest getRepairRequest(String url, String templateId, String openId, String[] values, String[] colors) {
+    public static WechatTemplateRequest getRepairRequest(String url, String templateId, String openId, String[] values, String[] colors,int templateType) {
         WechatTemplateRequest wechatTemplateRequest = new WechatTemplateRequest();
         wechatTemplateRequest.setUrl(url);
         wechatTemplateRequest.setTemplate_id(templateId);
         wechatTemplateRequest.setTouser(openId);
         // 填充模版数据
         Map<String, WechatTemplateRequestData> m = new HashMap<String, WechatTemplateRequestData>();
-        for (int i = 0; i < TEMPLATE_KEYS_REPAIR.length; i++) {
-            WechatTemplateRequestData data = new WechatTemplateRequestData();
-            data.setValue(values[i]);
-            data.setColor(colors[i]);
-            m.put(TEMPLATE_KEYS_REPAIR[i], data);
-        }
+        switch (templateType){
+			case 1:
+				// 默认为普通维修
+				for (int i = 0; i < TEMPLATE_KEYS_REPAIR.length; i++) {
+					WechatTemplateRequestData data = new WechatTemplateRequestData();
+					data.setValue(values[i]);
+					data.setColor(colors[i]);
+					m.put(TEMPLATE_KEYS_REPAIR[i], data);
+				}
+				break;
+			case 2:
+				// 完成维修
+				for (int i = 0; i < TEMPLATE_REPAIR_COMPLETE_KEYS_REPAIR.length; i++) {
+					WechatTemplateRequestData data = new WechatTemplateRequestData();
+					data.setValue(values[i]);
+					data.setColor(colors[i]);
+					m.put(TEMPLATE_REPAIR_COMPLETE_KEYS_REPAIR[i], data);
+				}
+				break;
+
+		}
         wechatTemplateRequest.setData(m);
         return wechatTemplateRequest;
     }

platform-service/src/main/java/com/platform/service/wechat/util/WeChatMessageUtil.java

@@ -102,7 +102,7 @@ public class WeChatMessageUtil {
                                         model.getContent(),
                                         vo.getName()
                                 }, new String[]{"#000000",
-                                        "#000000", "#000000", "#000000", "#000000", "#000000", "#000000" });
+                                        "#000000", "#000000", "#000000", "#000000", "#000000", "#000000" },1);
                 SpringContextHolder.publishEvent(new WechatEvent(request));
             }
         } catch (Exception e) {
@@ -116,14 +116,14 @@ public class WeChatMessageUtil {
      * @param url
      * @param values
      */
-    public static void sendWechatMessage(String openId, String url, String[] values,String wechatTemplateId) {
+    public static void sendWechatMessage(String openId, String url, String[] values,String wechatTemplateId,int templateType) {
         try {
             if(StringUtils.isBlank(url)){
                 throw new DeniedException("跳转详情url不能为空");
             }
             if (isSend() && StringUtils.isNotBlank(openId)) {
                 String[] colors = getColors(values.length);
-                WechatTemplateRequest request = WechatTemplateRequestBuilder.getRepairRequest(url, wechatTemplateId,openId, values, colors);
+                WechatTemplateRequest request = WechatTemplateRequestBuilder.getRepairRequest(url, wechatTemplateId,openId, values, colors,templateType);
                 SpringContextHolder.publishEvent(new WechatEvent(request));
             }
         } catch (Exception e) {