chao %!s(int64=4) %!d(string=hai) anos
pai
achega
caa42faacb

+ 1 - 1
src/main/java/com/caimei/modules/newhome/service/CmInstrumentMaintenanceService.java

@@ -93,7 +93,7 @@ public class CmInstrumentMaintenanceService extends CrudService<CmInstrumentMain
     public void update(CmInstrumentMaintenance cmInstrumentMaintenance) {
         CmInstrumentMaintenance dbbean = super.get(cmInstrumentMaintenance.getId());
         String wwwServer = Global.getConfig("wwwServer");
-        String msgLink = wwwServer + "/supplier/repair/detail.html?code=$";
+        String msgLink = wwwServer + "supplier/repair/detail.html?code=$";
         //用户分享链接
         CmInstrumentMaintenanceLinks link = cmInstrumentMaintenanceLinksDao.getShareLinkCode(cmInstrumentMaintenance.getId(), "1");
         String customerLink = "";

+ 10 - 6
src/main/java/com/caimei/modules/newhome/web/CmInstrumentMaintenanceController.java

@@ -71,16 +71,20 @@ public class CmInstrumentMaintenanceController extends BaseController {
             cmInstrumentMaintenance.setEndTime(cmInstrumentMaintenance.getEndTime() + " 23:59:59");
         }
         Page<CmInstrumentMaintenance> page = cmInstrumentMaintenanceService.findPage(new Page<>(request, response), cmInstrumentMaintenance);
+        String wwwServer = Global.getConfig("wwwServer");
         for (CmInstrumentMaintenance bean : page.getList()) {
             String type = "";
-            if ("1".equals(bean.getStatus()) && "1".equals(bean.getAuthenticity()))
+            if ("1".equals(bean.getStatus()) && "1".equals(bean.getAuthenticity())) {
                 type = "2";
-            if ("2".equals(bean.getStatus()) || "3".equals(bean.getStatus()))
+            }
+            if ("2".equals(bean.getStatus()) || "3".equals(bean.getStatus())) {
                 type = "3";
+            }
             if (StringUtils.isNoneBlank(type)) {
                 CmInstrumentMaintenanceLinks l = cmInstrumentMaintenanceLinksService.findWithType(bean.getId(), type);
-                if (l != null)
-                    bean.setLink(Global.getConfig("caimei.crm.server") + "maintain/page/" + l.getLinkCode() +".shtml");
+                if (l != null){
+                    bean.setLink(wwwServer + "supplier/repair/detail.html?code=" + l.getLinkCode());
+                }
             }
         }
         model.addAttribute("page", page);
@@ -115,8 +119,8 @@ public class CmInstrumentMaintenanceController extends BaseController {
             b = cmInstrumentMaintenanceLinksService.findWithType(cmInstrumentMaintenance.getId(), "3");
         }
         if (b != null && StringUtils.isNoneEmpty(b.getLinkCode())) {
-            String wwwServer = Global.getConfig("caimei.crm.server");
-            String link = wwwServer + "maintain/page/" + b.getLinkCode() +".shtml";
+            String wwwServer = Global.getConfig("wwwServer");
+            String link = wwwServer + "supplier/repair/detail.html?code=" + b.getLinkCode();
             model.addAttribute("link", link);
         }
         model.addAttribute("cmInstrumentMaintenance", cmInstrumentMaintenance);