修改部分

admin-ui/app/whepi/home/home.js

@@ -215,7 +215,7 @@ define(function (require) {
                         items: [
                             [{xtype: 'offset'},
                                 {
-                                    xtype: 'button', text: '导出凌云正常家庭上报', class: 'button-blue', onClick: function () {
+                                    xtype: 'button', text: '导出江中耀华正常家庭上报', class: 'button-blue', onClick: function () {
                                         if (!queryGrid3()) {
                                             return;
                                         }

admin-ui/app/whepi/index.js

@@ -134,7 +134,7 @@ $(function () {
         onLoadSuccess: function (node, data) {
         }
       });
-    } else if (userRole == "7") {//凌云集团管理员
+    } else if (userRole == "7") {//江中耀华管理员
       $('#menutree').tree({
         url: '/app/whepi/mock/menu7.json',
         onDblClick: function (node) {

admin-ui/app/whepi/lingyun/lingyunUser.js

@@ -134,23 +134,23 @@ define(function (require) {
               queryGrid1();
             },
           },
-          {
-            xtype: 'combobox',
-            label: '二级部门',
-            name: 'departmentId',
-            labelWidth: 'auto',
-            width: 280,
-            value: '',
-            data: getList(),
-            onRender: function () {
-              $coma = $(this);
-            },
-            onValue: function (data) {
-            },
-            onChange: function () {
-              queryGrid1();
-            }
-          },
+          // {
+          //   xtype: 'combobox',
+          //   label: '二级部门',
+          //   name: 'departmentId',
+          //   labelWidth: 'auto',
+          //   width: 280,
+          //   value: '',
+          //   data: getList(),
+          //   onRender: function () {
+          //     $coma = $(this);
+          //   },
+          //   onValue: function (data) {
+          //   },
+          //   onChange: function () {
+          //     queryGrid1();
+          //   }
+          // },
           {
             name: 'date',
             label: '导出时间',
@@ -270,7 +270,7 @@ define(function (require) {
                   {
                     text: '导出接种明细', iconCls: 'fa fa-cloud-upload', onClick: function () {
                       var unitId = $form.formGet().unitId;
-                      var departmentId = $form.formGet().departmentId;
+                      var departmentId = "";
                       if (unitId == null || unitId == "") {
                         unitId = 0
                       }
@@ -295,7 +295,7 @@ define(function (require) {
                       var isContact = $form.formGet().isContact;
                       var isSuspected = $form.formGet().isSuspected;
                       var isTrip = $form.formGet().isTrip;
-                      var departmentId = $form.formGet().departmentId;
+                      var departmentId = "";
                       window.open(api('/sweepCode/exSelectLingyunUser?queryProperties='+queryProperties+"&unitId="+unitId + "&date="+date+
                       '&msStatus='+msStatus+'&isContact='+isContact+'&isSuspected='+isSuspected+'&isTrip='+isTrip+ '&departmentId=' + departmentId));
                     }
@@ -303,7 +303,7 @@ define(function (require) {
                   {
                     text: '导出正常复工人员', iconCls: 'fa fa-cloud-upload', onClick: function () {
                       var unitId = $form.formGet().unitId;
-                      var departmentId = $form.formGet().departmentId;
+                      var departmentId = "";
                       window.open(api('/returnWork/exReturnWork?unitId='+unitId + '&departmentId=' + departmentId));
                     }
                   },
@@ -427,7 +427,7 @@ define(function (require) {
                     {field: 'imgCount', hidden: true},
                     {field: 'linkman', title: '姓名', maxWidth: 200, align: 'left',},
                     {field: 'loudong', title: '部门名称', maxWidth: 200, align: 'left',},
-                    {field: 'departmentName', title: '二级部门', maxWidth: 200, align: 'left',},
+                    // {field: 'departmentName', title: '二级部门', maxWidth: 200, align: 'left',},
                     {
                       field: 'living', title: '居家2公里', maxWidth: 100, align: 'center', formatter: function (value) {
                         if (value == 1) {

whepi-ui/templates/user/returnWork.ftl

@@ -7,13 +7,13 @@
             <div class="page__bd">
                 <header class="user-header">
                     <br/>
-                    <#if (uptownId??) && (uptownId == 1238790987234 || uptownId == 5 )>
-                        <img class="user-title" style="height: 60px;width: 70px;" id="qr" src="/ly.png"/>
-                    </#if>
-                    <#if (uptownId??) && (uptownId != 1238790987234 && uptownId != 5 )>
-                        <br/>
-                        <br/>
-                    </#if>
+<#--                    <#if (uptownId??) && (uptownId == 1238790987234 || uptownId == 5 )>-->
+<#--                        <img class="user-title" style="height: 60px;width: 70px;" id="qr" src="/ly.png"/>-->
+<#--                    </#if>-->
+<#--                    <#if (uptownId??) && (uptownId != 1238790987234 && uptownId != 5 )>-->
+<#--                    </#if>-->
+                    <br/>
+                    <br/>
                     <p class="user-title-long">${doorplate!''}</p>
                     <p class="user-title-long">${name!''}</p>
                     <br/>

whepi-web/src/main/java/com/bofeng/dao/MsReportMapper.java

@@ -208,6 +208,15 @@ public interface MsReportMapper extends BaseMapper<MsReport> {
     MsTripDet returnWork(@Param("userId") Long userId);
 
     /**
+     * 指定天数的上报地点
+     *
+     * @param userId
+     * @return
+     */
+    @Select("select city,count(city) as cityNum from ms_report where user_create = #{userId} and report_date > date_sub(curdate(),interval #{day} day) GROUP BY city")
+    List<MsReport> addrByDay(@Param("userId") Long userId, int day);
+
+    /**
      * 最近去工作驻地的时间
      *
      * @param userId
@@ -223,7 +232,7 @@ public interface MsReportMapper extends BaseMapper<MsReport> {
      * @param userId
      * @return
      */
-    @Select("SELECT a.*,CASE WHEN c.work_local = 4 THEN c.work_local_other ELSE c.work_local END as workMsg,CASE WHEN c.today_local = 4 THEN c.today_local_other ELSE c.today_local END as todayMsg " +
+    @Select("SELECT a.*,c.auto_local,CASE WHEN c.work_local = 4 THEN c.work_local_other ELSE c.work_local END as workMsg,CASE WHEN c.today_local = 4 THEN c.today_local_other ELSE c.today_local END as todayMsg " +
             "FROM ms_report a LEFT JOIN ms_suspected b ON a.report_id = b.report_id LEFT JOIN ms_trip c ON b.suspected_id = c.trip_id WHERE a.report_status = 1 AND a.user_create = #{userId} ORDER BY a.report_date DESC LIMIT 1")
     MsReport msAddr(@Param("userId") Long userId);
 

whepi-web/src/main/java/com/bofeng/entity/ExcelRiBaoLYBM4.java

@@ -55,6 +55,7 @@ public class ExcelRiBaoLYBM4 {
     private int msStatus;
 
     private Long userId;
+    private String workAddr;
 
     @ExcelProperty(value = "部门名称", index = 1)
     private String loudong = "";

whepi-web/src/main/java/com/bofeng/entity/MsReport.java

@@ -67,6 +67,13 @@ public class MsReport {
     @TableField("latitude")
     private String latitude;
 
+    @ApiModelProperty("获取的位置")
+    @TableField("city")
+    private String city;
+
+    @TableField(exist = false)
+    private int cityNum;
+
     @TableField("user_create")
     private Long userCreate;
 
@@ -91,6 +98,11 @@ public class MsReport {
     @TableField(exist = false)
     private String userUpdateName = "";
 
+    /**
+     * 打卡定位地点
+     */
+    @TableField(exist = false)
+    private String autoLocal;
     @TableField(exist = false)
     private String workMsg;
     @TableField(exist = false)

whepi-web/src/main/java/com/bofeng/entity/SysUptownHome.java

@@ -53,5 +53,9 @@ public class SysUptownHome {
     @TableField("TIME_UPDATE")
     private DateTime timeUpdate;
 
+    @ApiModelProperty("工作驻地")
+    @TableField("work_addr")
+    private String workAddr;
+
 
 }

whepi-web/src/main/java/com/bofeng/entity/UptownHome.java

@@ -66,4 +66,8 @@ public class UptownHome {
     @TableField(exist = false)
     private String doorplate;
 
+    @ApiModelProperty("工作驻地")
+    @TableField("work_addr")
+    private String workAddr;
+
 }

whepi-web/src/main/java/com/bofeng/service/MsSuspectedService.java

@@ -113,7 +113,7 @@ public class MsSuspectedService {
     @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
     public Long addSuspected(Long suspectedId, String userName, Integer grender, Integer age, String familyStatus,
                              String statusDesp, Integer medical, BigDecimal temperature, Integer cough, Integer muscle,
-                             Integer dyspnea, Integer fatigue, Integer diarrhea, Integer singleRoom, String others, Long userCreate, Integer scoreRezult, Integer temperatureScore, Integer scoreHistroy, Integer score, String longitude, String latitude) {
+                             Integer dyspnea, Integer fatigue, Integer diarrhea, Integer singleRoom, String others, Long userCreate, Integer scoreRezult, Integer temperatureScore, Integer scoreHistroy, Integer score, String longitude, String latitude, String autoLocal) {
         Long reportId = 0L;
         //如果是当前日期 已经添加
         Date t = new Date();
@@ -260,7 +260,7 @@ public class MsSuspectedService {
         }
 
         //更新今日日报
-        updateReport(reportId, medical, singleRoom, temperature, longitude, latitude);
+        updateReport(reportId, medical, singleRoom, temperature, longitude, latitude, autoLocal);
         return reportId;
     }
 
@@ -281,7 +281,7 @@ public class MsSuspectedService {
 
     //更新今日日报
     @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
-    public void updateReport(Long reportId, Integer medical, Integer singleRoom, BigDecimal temperature, String longitude, String latitude) {
+    public void updateReport(Long reportId, Integer medical, Integer singleRoom, BigDecimal temperature, String longitude, String latitude, String autoLocal) {
         //更新今日日报
         Integer trueNum = 0, singleNum = 0, isSuspected = 0, isNoSuspected = 0, isFamliy = 0, abnormalNum = 0;
 
@@ -313,6 +313,7 @@ public class MsSuspectedService {
             msReport.setSafetyNum(isFamliy);
             msReport.setLongitude(longitude);
             msReport.setLatitude(latitude);
+            msReport.setCity(autoLocal);
             if (isNoSuspected > 0 || abnormalNum > 0)
                 msReport.setMsStatus(2);
             else

whepi-web/src/main/java/com/bofeng/service/MsTripService.java

@@ -76,6 +76,7 @@ public class MsTripService {
             msReport.setTimeUpdate(data);
             msReport.setLatitude(latitude);
             msReport.setLongitude(longitude);
+            msReport.setCity(autoLocal);
             msReportMapper.insert(msReport);
         } else {
             reportId = listReport.get(0).getReportId();
@@ -197,7 +198,7 @@ public class MsTripService {
                 }
             }
             //更新今日日报,直接上报
-            msSuspectedService.updateReport(reportId, medical, singleRoom, temperature, longitude, latitude);
+            msSuspectedService.updateReport(reportId, medical, singleRoom, temperature, longitude, latitude, autoLocal);
 
         } else {
             //判断家人是否同名
@@ -304,7 +305,7 @@ public class MsTripService {
                 }
             }
             //更新今日日报,直接上报
-            msSuspectedService.updateReport(reportId, medical, singleRoom, temperature, longitude, latitude);
+            msSuspectedService.updateReport(reportId, medical, singleRoom, temperature, longitude, latitude, autoLocal);
             //修改上报状态
             msReportService.editReportLy(reportId, userCreate);
         }

whepi-web/src/main/java/com/bofeng/service/ScanService.java

@@ -185,7 +185,7 @@ public class ScanService {
     /**
      * 页面复工检索
      */
-    public int returnWorkLYlist(Long userId, String linkman, String phone) throws ParseException {
+    public int returnWorkLYlist(Long userId, String linkman, String phone, String workAddr) throws ParseException {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         SimpleDateFormat s = new SimpleDateFormat("yyyy-MM-dd");
         OutUser outUser1 = outUserMapper.getOutUserByPhone(4, linkman, Long.parseLong(phone));
@@ -235,6 +235,14 @@ public class ScanService {
         if (msReports3.size() > 0) {
             return 0;
         }
+        List<MsReport> msReports4 = msReportMapper.selectMsReportThirtyError(userId);
+        if (msReports4.size() > 0) {
+            return 0;
+        }
+        MsReport msReport1 = msReportMapper.msAddr(userId);
+        if (msReport1 != null && !msReport1.getAutoLocal().equals(workAddr)) {
+            return 0;
+        }
 //        MsTripDet work = msReportMapper.returnWork(userId);
 //        if (work != null) {
 //            if (ly2 && outUser2.getStartDate().getTime() < s.parse(work.getReturnWork()).getTime()) {

whepi-web/src/main/java/com/bofeng/service/SweepCodeService.java

@@ -107,28 +107,28 @@ public class SweepCodeService {
                     excelRiBaoLYBM4.setTripDetDesc(tripDet.substring(0, tripDet.length() - 1));
                 }
                 // 复工
-                excelRiBaoLYBM4.setReturnWork(scanService.returnWorkLYlist(excelRiBaoLYBM4.getUserId(), excelRiBaoLYBM4.getLinkman(), excelRiBaoLYBM4.getPhone()));
-                // 昨天定位和今天定位是否2公里
-                List<MsReport> msReports = msReportMapper.selectLatelyLocal(excelRiBaoLYBM4.getUserId());
-                if (msReports.size() == 2) {
-                    Double dis = scanService.getDistance(Double.parseDouble(msReports.get(1).getLongitude()),Double.parseDouble(msReports.get(1).getLatitude()),Double.parseDouble(msReports.get(0).getLongitude()), Double.parseDouble(msReports.get(0).getLatitude()));
-                    if (dis <= 2000) {
-                        excelRiBaoLYBM4.setLiving(1);
-                    } else {
-                        excelRiBaoLYBM4.setLiving(2);
-                    }
-                } else {
-                    excelRiBaoLYBM4.setLiving(0);
-                }
-                // 出行轨迹是否出门
-                List<MsReportLog> msReportLogs = msReportLogMapper.logAddr(excelRiBaoLYBM4.getUserId());
-                if (msReportLogs.size() > 1) {
-                    excelRiBaoLYBM4.setTravelRecords(1);
-                } else if (msReportLogs.size() == 1)  {
-                    excelRiBaoLYBM4.setTravelRecords(2);
-                } else {
-                    excelRiBaoLYBM4.setTravelRecords(0);
-                }
+                excelRiBaoLYBM4.setReturnWork(scanService.returnWorkLYlist(excelRiBaoLYBM4.getUserId(), excelRiBaoLYBM4.getLinkman(), excelRiBaoLYBM4.getPhone(), excelRiBaoLYBM4.getWorkAddr()));
+//                // 昨天定位和今天定位是否2公里
+//                List<MsReport> msReports = msReportMapper.selectLatelyLocal(excelRiBaoLYBM4.getUserId());
+//                if (msReports.size() == 2) {
+//                    Double dis = scanService.getDistance(Double.parseDouble(msReports.get(1).getLongitude()),Double.parseDouble(msReports.get(1).getLatitude()),Double.parseDouble(msReports.get(0).getLongitude()), Double.parseDouble(msReports.get(0).getLatitude()));
+//                    if (dis <= 2000) {
+//                        excelRiBaoLYBM4.setLiving(1);
+//                    } else {
+//                        excelRiBaoLYBM4.setLiving(2);
+//                    }
+//                } else {
+//                    excelRiBaoLYBM4.setLiving(0);
+//                }
+//                // 出行轨迹是否出门
+//                List<MsReportLog> msReportLogs = msReportLogMapper.logAddr(excelRiBaoLYBM4.getUserId());
+//                if (msReportLogs.size() > 1) {
+//                    excelRiBaoLYBM4.setTravelRecords(1);
+//                } else if (msReportLogs.size() == 1)  {
+//                    excelRiBaoLYBM4.setTravelRecords(2);
+//                } else {
+//                    excelRiBaoLYBM4.setTravelRecords(0);
+//                }
             }
         }
         return sysUptownHouses;
@@ -169,7 +169,7 @@ public class SweepCodeService {
                     excelRiBaoLYBM4.setTripDetDesc(tripDet.substring(0, tripDet.length() - 1));
                 }
                 // 复工
-                excelRiBaoLYBM4.setReturnWork(scanService.returnWorkLYlist(excelRiBaoLYBM4.getUserId(), excelRiBaoLYBM4.getLinkman(), excelRiBaoLYBM4.getPhone()));
+                excelRiBaoLYBM4.setReturnWork(scanService.returnWorkLYlist(excelRiBaoLYBM4.getUserId(), excelRiBaoLYBM4.getLinkman(), excelRiBaoLYBM4.getPhone(), excelRiBaoLYBM4.getWorkAddr()));
             }
         }
         return sysUptownHouses;
@@ -308,35 +308,33 @@ public class SweepCodeService {
                     }
                     excelRiBaoLYBM4.setTripDetDesc(tripDet.substring(0, tripDet.length() - 1));
                 }// 复工
-                if (userId > 7000 && userId < 8000) {
-                    excelRiBaoLYBM4.setReturnWork(scanService.returnWorkLYlist(excelRiBaoLYBM4.getUserId(), excelRiBaoLYBM4.getLinkman(), excelRiBaoLYBM4.getPhone()));
-                    if (excelRiBaoLYBM4.getReturnWork() == 1) {
-                        excelRiBaoLYBM4.setReturnWorkMsg("允许复工");
-                    } else {
-                        excelRiBaoLYBM4.setReturnWorkMsg("禁止复工");
-                    }
-                }
-                // 昨天定位和今天定位是否2公里
-                List<MsReport> msReports = msReportMapper.selectLatelyLocal(excelRiBaoLYBM4.getUserId());
-                if (msReports.size() == 2) {
-                    Double dis = scanService.getDistance(Double.parseDouble(msReports.get(1).getLongitude()),Double.parseDouble(msReports.get(1).getLatitude()),Double.parseDouble(msReports.get(0).getLongitude()), Double.parseDouble(msReports.get(0).getLatitude()));
-                    if (dis <= 2000) {
-                        excelRiBaoLYBM4.setLiving(1);
-                    } else {
-                        excelRiBaoLYBM4.setLiving(2);
-                    }
+                excelRiBaoLYBM4.setReturnWork(scanService.returnWorkLYlist(excelRiBaoLYBM4.getUserId(), excelRiBaoLYBM4.getLinkman(), excelRiBaoLYBM4.getPhone(), excelRiBaoLYBM4.getWorkAddr()));
+                if (excelRiBaoLYBM4.getReturnWork() == 1) {
+                    excelRiBaoLYBM4.setReturnWorkMsg("允许复工");
                 } else {
-                    excelRiBaoLYBM4.setLiving(0);
-                }
-                // 出行轨迹是否出门
-                List<MsReportLog> msReportLogs = msReportLogMapper.logAddr(excelRiBaoLYBM4.getUserId());
-                if (msReportLogs.size() > 1) {
-                    excelRiBaoLYBM4.setTravelRecords(1);
-                } else if (msReportLogs.size() == 1)  {
-                    excelRiBaoLYBM4.setTravelRecords(2);
-                } else {
-                    excelRiBaoLYBM4.setTravelRecords(0);
-                }
+                    excelRiBaoLYBM4.setReturnWorkMsg("禁止复工");
+                }
+//                // 昨天定位和今天定位是否2公里
+//                List<MsReport> msReports = msReportMapper.selectLatelyLocal(excelRiBaoLYBM4.getUserId());
+//                if (msReports.size() == 2) {
+//                    Double dis = scanService.getDistance(Double.parseDouble(msReports.get(1).getLongitude()),Double.parseDouble(msReports.get(1).getLatitude()),Double.parseDouble(msReports.get(0).getLongitude()), Double.parseDouble(msReports.get(0).getLatitude()));
+//                    if (dis <= 2000) {
+//                        excelRiBaoLYBM4.setLiving(1);
+//                    } else {
+//                        excelRiBaoLYBM4.setLiving(2);
+//                    }
+//                } else {
+//                    excelRiBaoLYBM4.setLiving(0);
+//                }
+//                // 出行轨迹是否出门
+//                List<MsReportLog> msReportLogs = msReportLogMapper.logAddr(excelRiBaoLYBM4.getUserId());
+//                if (msReportLogs.size() > 1) {
+//                    excelRiBaoLYBM4.setTravelRecords(1);
+//                } else if (msReportLogs.size() == 1)  {
+//                    excelRiBaoLYBM4.setTravelRecords(2);
+//                } else {
+//                    excelRiBaoLYBM4.setTravelRecords(0);
+//                }
             }
         }
         return sysUptownHouses;

whepi-web/src/main/java/com/bofeng/wx/controller/MsReportController.java

@@ -72,9 +72,10 @@ public class MsReportController {
         //经纬度
         String longitude = request.getParameter("longitude");
         String latitude = request.getParameter("latitude");
+        String autoLocal = request.getParameter("autoLocal");
 
         MsReport msReport = new MsReport();
-        Long reportId = msSuspectedService.addSuspected(suspectedId, userName, grender, age, familyStatus, statusDesp, medical, temperature, cough, muscle, dyspnea, fatigue, diarrhea, singleRoom, others, userCreate, scoreRezult, temperatureScore, scoreHistroy, score, longitude, latitude);
+        Long reportId = msSuspectedService.addSuspected(suspectedId, userName, grender, age, familyStatus, statusDesp, medical, temperature, cough, muscle, dyspnea, fatigue, diarrhea, singleRoom, others, userCreate, scoreRezult, temperatureScore, scoreHistroy, score, longitude, latitude, autoLocal);
         if (reportId == 2L)
             msReport.setMsgReport("2");
         else

whepi-web/src/main/java/com/bofeng/wx/controller/ScanAdminController.java

@@ -298,7 +298,7 @@ public class ScanAdminController {
         }
         map.put("unitId", unitId);
         List<Vaccine> list = sweepCodeService.exSelectVaccine(map, 1238790987234L, userId);
-        ExcelUtils.writeSheet(Vaccine.class, list).export(resp,"凌云集团疫苗接种");
+        ExcelUtils.writeSheet(Vaccine.class, list).export(resp,"江中耀华疫苗接种");
     }
 
     @ApiOperation("凌云导出")
@@ -306,7 +306,7 @@ public class ScanAdminController {
     @SneakyThrows
     public void exportLY(HttpParameterParser parser,HttpServletResponse resp) {
         List<SysUptownHouseLY> sysUptownHouses = sweepCodeService.exportLY(parser.getMap());
-        ExcelUtils.writeSheet(SysUptownHouseLY.class, sysUptownHouses).export(resp,"凌云集团出入管理");
+        ExcelUtils.writeSheet(SysUptownHouseLY.class, sysUptownHouses).export(resp,"江中耀华出入管理");
     }
 
     @ApiOperation("和昌出入查询")
@@ -627,7 +627,7 @@ public class ScanAdminController {
         map.put("departmentId", departmentId);
         List<ReturnWorkLy> list = returnWorkLyMapper.exgetAllUser(map);
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        ExcelUtils.writeSheet(ReturnWorkLy.class, list).export(resp,"凌云集团正常复工员工" + sdf.format(new Date()));
+        ExcelUtils.writeSheet(ReturnWorkLy.class, list).export(resp,"江中耀华正常复工员工" + sdf.format(new Date()));
     }
 
     @ApiOperation("凌云签到")

whepi-web/src/main/java/com/bofeng/wx/controller/ScanController.java

@@ -91,7 +91,7 @@ public class ScanController {
             model.put("uptownId", unit.getUptownId());
             model.put("tittle", "电子出入许可");
             if (unit.getUptownId() == 1238790987234L || unit.getUptownId() == 5) {
-                model.put("tittle", "凌云集团电子通行");
+                model.put("tittle", "江中耀华电子通行");
                 ly = true;
             }
             if (unit.getUptownId() == 100000002L) {
@@ -138,18 +138,18 @@ public class ScanController {
                 }
                 if (ly) {
                     if ("".equals(coord)) {
-                        String url = oauth2+appId +"&redirect_uri="+URLEncoder.encode(domain()+"user/scan.html?doorId="+doorId+"&inType="+inType + "&coord=","utf-8");
+                        String url = oauth2 + appId + "&redirect_uri=" + URLEncoder.encode(domain() + "user/scan.html?doorId=" + doorId + "&inType=" + inType + "&coord=", "utf-8");
                         model.put("url", url);
                         model.put("moreUrl", moreUrl);
                         return new ModelAndView("/user/location.ftl", model);
                     } else {
                         String[] coor = coord.split(",");
-                        Double dis = scanService.getDistance(Double.parseDouble(coor[0]),Double.parseDouble(coor[1]),Double.parseDouble(uptownDoor.getLongitude()), Double.parseDouble(uptownDoor.getLatitude()));
-                        if(dis > Double.parseDouble(uptownDoor.getDistance().toString())) {
+                        Double dis = scanService.getDistance(Double.parseDouble(coor[0]), Double.parseDouble(coor[1]), Double.parseDouble(uptownDoor.getLongitude()), Double.parseDouble(uptownDoor.getLatitude()));
+                        if (dis > Double.parseDouble(uptownDoor.getDistance().toString())) {
                             model.put("collor", "red");
                             model.put("collor2", "red");
                             model.put("into", "不许进入");
-                            model.put("errorMsg", "您当前扫码位置距离" +uptownDoor.getDoorName()+"太远，请到门口扫码，如有疑问请与上级管理部门联系。");
+                            model.put("errorMsg", "您当前扫码位置距离" + uptownDoor.getDoorName() + "太远，请到门口扫码，如有疑问请与上级管理部门联系。");
                             scanService.saveOutScan(userOpen.getUserId(), inType, coord, address, uptownDoor.getUptownId(), uptownDoor.getDoorId(), -1, model.get("errorMsg").toString());
                             return new ModelAndView("/user/scan.ftl", model);
                         }
@@ -159,7 +159,7 @@ public class ScanController {
                         model.put("collor", "red");
                         model.put("collor2", "red");
                         model.put("into", "不许进入");
-                        model.put("errorMsg", "声明：根据凌云集团防疫指挥部复工条件，您属于不可复工六类人员之一，如有疑问请与上级管理部门联系。");
+                        model.put("errorMsg", "声明：根据江中耀华防疫指挥部复工条件，您属于不可复工六类人员之一，如有疑问请与上级管理部门联系。");
                         scanService.saveOutScan(userOpen.getUserId(), inType, coord, address, uptownDoor.getUptownId(), uptownDoor.getDoorId(), -1, model.get("errorMsg").toString());
                         return new ModelAndView("/user/scan.ftl", model);
                     }
@@ -168,7 +168,7 @@ public class ScanController {
                         model.put("collor", "green");
                         model.put("collor2", "green");
                         model.put("into", "允许通行");
-                        model.put("errorMsg", "声明：复工许可证是根据员工自主填写健康日报，结合凌云集团复工条件自动产生。原则上代表员工可复工，在厂门口扫描二维码生成绿色复工通行证，并接受检查后，可入厂。");
+                        model.put("errorMsg", "声明：复工许可证是根据员工自主填写健康日报，结合江中耀华复工条件自动产生。原则上代表员工可复工，在厂门口扫描二维码生成绿色复工通行证，并接受检查后，可入厂。");
                         scanService.saveOutScan(userOpen.getUserId(), inType, coord, address, uptownDoor.getUptownId(), uptownDoor.getDoorId(), 1, "");
                         return new ModelAndView("/user/scan.ftl", model);
                     }
@@ -180,8 +180,8 @@ public class ScanController {
                     if (outUser2 != null) {
                         ly2 = true;
                         startDate = s.format(outUser2.getStartDate());
-                        Long day = (new Date().getTime() - outUser2.getStartDate().getTime()) /  (1000 * 60 * 60 * 24) -1;
-                        intSize =  Integer.parseInt(Long.toString(day)) < 3 ? Integer.parseInt(Long.toString(day)) : 3;
+                        Long day = (new Date().getTime() - outUser2.getStartDate().getTime()) / (1000 * 60 * 60 * 24) - 1;
+                        intSize = Integer.parseInt(Long.toString(day)) < 3 ? Integer.parseInt(Long.toString(day)) : 3;
                     }
                     if (!unit.getUptownId().equals(uptownDoor.getUptownId())) {
                         model.put("collor", "red");
@@ -200,7 +200,7 @@ public class ScanController {
                             model.put("errorMsg", "由于您上报过新冠确诊、新冠疑似或密切接触者，不许进入，如有疑问请联系直管领导。");
                             scanService.saveOutScan(userOpen.getUserId(), inType, coord, address, uptownDoor.getUptownId(), uptownDoor.getDoorId(), -1, model.get("errorMsg").toString());
                             return new ModelAndView("/user/scan.ftl", model);
-                        } else if (!ly2)  {
+                        } else if (!ly2) {
                             model.put("collor", "red");
                             model.put("collor2", "red");
                             model.put("into", "不许进入");
@@ -227,7 +227,7 @@ public class ScanController {
                             model.put("errorMsg", "由于您的家庭成员有新冠确诊或密切接触史人员，不许进入，如有疑问请联系直管领导。");
                             scanService.saveOutScan(userOpen.getUserId(), inType, coord, address, uptownDoor.getUptownId(), uptownDoor.getDoorId(), -1, model.get("errorMsg").toString());
                             return new ModelAndView("/user/scan.ftl", model);
-                        } else if (!ly2)  {
+                        } else if (!ly2) {
                             model.put("collor", "red");
                             model.put("collor2", "red");
                             model.put("into", "不许进入");
@@ -307,13 +307,13 @@ public class ScanController {
                     model.put("collor", "green");
                     model.put("collor2", "green");
                     model.put("into", "允许进入");
-                    model.put("errorMsg", "声明：复工通行证是根据员工自主填写健康日报，结合凌云集团复工条件自动产生。原则上代表员工可以通行，在接受规定检查后，方可入厂。");
+                    model.put("errorMsg", "声明：复工通行证是根据员工自主填写健康日报，结合江中耀华复工条件自动产生。原则上代表员工可以通行，在接受规定检查后，方可入厂。");
                     scanService.saveOutScan(userOpen.getUserId(), inType, coord, address, uptownDoor.getUptownId(), uptownDoor.getDoorId(), 1, "");
                     return new ModelAndView("/user/scan.ftl", model);
                 }
                 if (hc) {
                     if ("".equals(coord)) {
-                        String url = oauth2+appId +"&redirect_uri="+URLEncoder.encode(domain()+"user/scan.html?doorId="+doorId+"&inType="+inType + "&coord=","utf-8");
+                        String url = oauth2 + appId + "&redirect_uri=" + URLEncoder.encode(domain() + "user/scan.html?doorId=" + doorId + "&inType=" + inType + "&coord=", "utf-8");
                         model.put("url", url);
                         model.put("moreUrl", moreUrl);
                         return new ModelAndView("/user/location.ftl", model);
@@ -624,7 +624,7 @@ public class ScanController {
 
     @ApiOperation("复工查询")
     @GetMapping("/whepi/user/returnWork.html")
-    public ModelAndView adminSelectReturnWork(@Pd(name = "userId")Long userId, ModelMap model) throws ParseException {
+    public ModelAndView adminSelectReturnWork(@Pd(name = "userId") Long userId, ModelMap model) throws ParseException {
         return returnWork(userId, model);
     }
 
@@ -633,75 +633,51 @@ public class ScanController {
         UptownUnit unit = uptownUnitMapper.getUptownUnitByUser(userId);
         model.put("uptownId", unit.getUptownId());
         if (unit.getUptownId() == 1238790987234L || unit.getUptownId() == 5) {
-            model.put("tittle", "凌云集团");
+            model.put("tittle", "江中耀华");
             model.put("doorplate", unit.getRidgepole() + unit.getUnit());
             model.put("name", uptownHomes.get(0).getLinkman());
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             SimpleDateFormat s = new SimpleDateFormat("yyyy-MM-dd");
             model.put("now", sdf.format(new Date()));
-            OutUser outUser1 = outUserMapper.getOutUserByPhone(4, uptownHomes.get(0).getLinkman(), Long.parseLong(uptownHomes.get(0).getPhone()));
-            if (outUser1 != null) {
-                model.put("collor", "red");
-                model.put("collor2", "red");
-                model.put("into", "不可复工");
-                model.put("errorMsg", "声明：根据凌云集团防疫指挥部复工条件，您属于不可复工六类人员之一，如有疑问请与上级管理部门联系。");
-                return new ModelAndView("/user/returnWork.ftl", model);
-            }
+//            OutUser outUser1 = outUserMapper.getOutUserByPhone(4, uptownHomes.get(0).getLinkman(), Long.parseLong(uptownHomes.get(0).getPhone()));
+//            if (outUser1 != null) {
+//                model.put("collor", "red");
+//                model.put("collor2", "red");
+//                model.put("into", "不可复工");
+//                model.put("errorMsg", "声明：根据江中耀华防疫指挥部复工条件，您属于不可复工六类人员之一，如有疑问请与上级管理部门联系。");
+//                return new ModelAndView("/user/returnWork.ftl", model);
+//            }
             OutUser outUser = outUserMapper.getOutUserByPhone(1, uptownHomes.get(0).getLinkman(), Long.parseLong(uptownHomes.get(0).getPhone()));
             if (outUser != null) {
                 model.put("collor", "blue-ly");
                 model.put("collor2", "blue-ly");
                 model.put("into", "允许复工");
-                model.put("errorMsg", "声明：复工许可证是根据员工自主填写健康日报，结合凌云集团复工条件自动产生。原则上代表员工可复工，在厂门口扫描二维码生成绿色复工通行证，并接受检查后，可入厂。");
+                model.put("errorMsg", "声明：复工许可证是根据员工自主填写健康日报，结合江中耀华复工条件自动产生。原则上代表员工可复工，可入厂。");
                 return new ModelAndView("/user/returnWork.ftl", model);
             }
-            Boolean ly2 = false;
             String startDate = "";
             int intSize = 3;
             OutUser outUser2 = outUserMapper.getOutUserByPhoneNotTime(5, uptownHomes.get(0).getLinkman(), Long.parseLong(uptownHomes.get(0).getPhone()));
             if (outUser2 != null) {
-                ly2 = true;
                 startDate = s.format(outUser2.getStartDate());
-                Long day = (new Date().getTime() - outUser2.getStartDate().getTime()) /  (1000 * 60 * 60 * 24) -1;
-                intSize =  Integer.parseInt(Long.toString(day)) < 3 ? Integer.parseInt(Long.toString(day)) : 3;
+                Long day = (new Date().getTime() - outUser2.getStartDate().getTime()) / (1000 * 60 * 60 * 24) - 1;
+                intSize = Integer.parseInt(Long.toString(day)) < 3 ? Integer.parseInt(Long.toString(day)) : 3;
             }
             MsReport msReport = msReportMapper.queryMsReportIsXG(userId);
             if (msReport != null) {
-                if (ly2 && outUser2.getStartDate().getTime() < msReport.getReportDate().getTime()) {
-                    model.put("collor", "red");
-                    model.put("collor2", "red");
-                    model.put("into", "不可复工");
-                    model.put("errorMsg", "由于您上报过新冠确诊、新冠疑似或密切接触者，不可复工，如有疑问请联系直管领导。");
-                    return new ModelAndView("/user/returnWork.ftl", model);
-//                List<MsReport> msReports1 = msReportMapper.queryLateStatus(userId, s.format(msReport.getReportDate()));
-//                if (msReports1.size() == 0) {
-//                    model.put("collor", "red");
-//                    model.put("collor2", "red");
-//                    model.put("into", "不可复工");
-//                    model.put("errorMsg", "由于您上报过新冠确诊、新冠疑似或密切接触者，且未解除医学隔离，不可复工，如有疑问请联系直管领导。");
-//                    return new ModelAndView("/user/returnWork.ftl", model);
-//                }
-                } else if (!ly2) {
-                    model.put("collor", "red");
-                    model.put("collor2", "red");
-                    model.put("into", "不可复工");
-                    model.put("errorMsg", "由于您上报过新冠确诊、新冠疑似或密切接触者，不可复工，如有疑问请联系直管领导。");
-                    return new ModelAndView("/user/returnWork.ftl", model);
-                }
+                model.put("collor", "red");
+                model.put("collor2", "red");
+                model.put("into", "不可复工");
+                model.put("errorMsg", "由于您上报过新冠确诊、新冠疑似或密切接触者，不可复工，如有疑问请联系直管领导。");
+                return new ModelAndView("/user/returnWork.ftl", model);
             }
             List<MsReport> msReportList = msReportMapper.queryMsReportIsXGHome(userId);
             if (msReportList.size() > 0) {
-                if (ly2 && outUser2.getStartDate().getTime() < msReportList.get(0).getReportDate().getTime()) {
+                if (outUser2.getStartDate().getTime() < msReportList.get(0).getReportDate().getTime()) {
                     model.put("collor", "red");
                     model.put("collor2", "red");
                     model.put("into", "不可复工");
-                    model.put("errorMsg", "由于您的家庭成员有新冠确诊或密切接触史人员，不可复工，如有疑问请联系直管领导。");
-                    return new ModelAndView("/user/returnWork.ftl", model);
-                } else if (!ly2)  {
-                    model.put("collor", "red");
-                    model.put("collor2", "red");
-                    model.put("into", "不可复工");
-                    model.put("errorMsg", "由于您的家庭成员有新冠确诊或密切接触史人员，不可复工，如有疑问请联系直管领导。");
+                    model.put("errorMsg", "由于您的同住成员有新冠确诊或密切接触史人员，不可复工，如有疑问请联系直管领导。");
                     return new ModelAndView("/user/returnWork.ftl", model);
                 }
             }
@@ -729,23 +705,33 @@ public class ScanController {
                 model.put("errorMsg", "由于近期您的家庭成员健康评估存在问题，不可复工，如有疑问请联系直管领导。");
                 return new ModelAndView("/user/returnWork.ftl", model);
             }
-//            List<MsReport> msReports3 = msReportMapper.selectMsReportThirtyError(userId);
-//            if (msReports3.size() > 0) {
-//                model.put("collor", "red");
-//                model.put("collor2", "red");
-//                model.put("into", "不可复工");
-//                model.put("errorMsg", "由于最近30天您健康评估存在问题，不可复工，如有疑问请联系直管领导。");
-//                return new ModelAndView("/user/returnWork.ftl", model);
-//            }
-//            MsReport msReport1 = msReportMapper.msAddr(userId);
-//            if (msReport1 != null &&msReport1.getWorkMsg() != null &&msReport1.getTodayMsg() != null && !msReport1.getWorkMsg().equals(msReport1.getTodayMsg()) && !compareWhere(msReport1.getWorkMsg(), msReport1.getTodayMsg())) {
-//                model.put("collor", "red");
-//                model.put("collor2", "red");
-//                model.put("into", "不可复工");
-//                model.put("errorMsg", "您本人不在工作驻地，不能入场复工。");
-//                return new ModelAndView("/user/returnWork.ftl", model);
-//            }
-//            MsTripDet work = msReportMapper.returnWork(userId);
+            List<MsReport> msReports4 = msReportMapper.selectMsReportThirtyError(userId);
+            if (msReports4.size() > 0) {
+                model.put("collor", "red");
+                model.put("collor2", "red");
+                model.put("into", "不可复工");
+                model.put("errorMsg", "由于最近30天您健康评估存在问题，不可复工，如有疑问请联系直管领导。");
+                return new ModelAndView("/user/returnWork.ftl", model);
+            }
+            MsReport msReport1 = msReportMapper.msAddr(userId);
+            if (msReport1 != null && !msReport1.getAutoLocal().equals(uptownHomes.get(0).getWorkAddr())) {
+                model.put("collor", "red");
+                model.put("collor2", "red");
+                model.put("into", "不可复工");
+                model.put("errorMsg", "您本人不在工作驻地，不能入场复工。");
+                return new ModelAndView("/user/returnWork.ftl", model);
+            }
+            // 最近三天是否出行
+            MsTripDet work = msReportMapper.returnWork(userId);
+            if (outUser2.getStartDate().getTime() < s.parse(work.getReturnWork()).getTime()) {
+                if (sdf.parse(work.getReturnWork() + " 00:00:00").getTime() + 1000L * 3600 * 24 * 3 > sdf.parse(s.format(new Date()) + " 00:00:00").getTime()) {
+                    model.put("collor", "red");
+                    model.put("collor2", "red");
+                    model.put("into", "不可复工");
+                    model.put("errorMsg", "您返回工作驻地后未满3日，不可复工。" + dayHow(s.parse(work.getReturnWork()), 3) + "起方可进入！");
+                    return new ModelAndView("/user/returnWork.ftl", model);
+                }
+            }
 //            if (work != null) {
 //                if (ly2 && outUser2.getStartDate().getTime() < s.parse(work.getReturnWork()).getTime()) {
 //                    if (sdf.parse(work.getReturnWork() + " 00:00:00").getTime() + 1000L * 3600 * 24 * 15 > sdf.parse(s.format(new Date()) + " 00:00:00").getTime()) {
@@ -768,72 +754,9 @@ public class ScanController {
             model.put("collor", "blue-ly");
             model.put("collor2", "blue-ly");
             model.put("into", "允许复工");
-            model.put("errorMsg", "声明：复工许可证是根据员工自主填写健康日报，结合凌云集团复工条件自动产生。原则上代表员工可以复工，在厂门口扫描二维码生成绿色复工通行证，并接受规定检查后，方可入厂。");
+            model.put("errorMsg", "声明：复工许可证是根据员工自主填写健康日报，结合江中耀华复工条件自动产生。原则上代表员工可以复工，在厂门口扫描二维码生成绿色复工通行证，并接受规定检查后，方可入厂。");
             return new ModelAndView("/user/returnWork.ftl", model);
             //您近期内离开过工作单位驻地，请遵守返回工作驻地15日隔离规定，您目前未满15日，禁止进入。
-        }else if (unit.getUptownId() == 100000002L) {
-            model.put("tittle", "湖北和昌");
-            model.put("doorplate", unit.getRidgepole() + unit.getUnit());
-            model.put("name", uptownHomes.get(0).getLinkman());
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            SimpleDateFormat s = new SimpleDateFormat("yyyy-MM-dd");
-            model.put("now", sdf.format(new Date()));
-            OutUser outUser = outUserMapper.getOutUserByPhone(3, uptownHomes.get(0).getLinkman(), Long.parseLong(uptownHomes.get(0).getPhone()));
-            if (outUser != null) {
-                model.put("collor", "blue-ly");
-                model.put("collor2", "blue-ly");
-                model.put("into", "允许复工");
-                model.put("errorMsg", "特殊人员允许通行，请保证生产同时注意自身安全。");
-                return new ModelAndView("/user/returnWorkHC.ftl", model);
-            }
-            MsReport msReport = msReportMapper.queryMsReportIsXG(userId);
-            if (msReport != null) {
-                List<MsReport> msReports1 = msReportMapper.queryLateStatus(userId, s.format(msReport.getReportDate()));
-                if (msReports1.size() == 0) {
-                    model.put("collor", "red");
-                    model.put("collor2", "red");
-                    model.put("into", "不可复工");
-                    model.put("errorMsg", "由于您上报过新冠确诊、新冠疑似或密切接触者，且未解除医学隔离，不可复工，如有疑问请联系直管领导。");
-                    return new ModelAndView("/user/returnWorkHC.ftl", model);
-                }
-            }
-            List<MsReport> msReportList = msReportMapper.queryMsReportIsXGHome(userId);
-            if (msReportList.size() > 0) {
-                model.put("collor", "red");
-                model.put("collor2", "red");
-                model.put("into", "不许进入");
-                model.put("errorMsg", "由于您的家庭成员有新冠确诊或密切接触史人员，不许进入，如有疑问请联系直管领导。");
-                return new ModelAndView("/user/returnWorkHC.ftl", model);
-            }
-            List<MsReport> msReports = msReportMapper.selectMsReportLate(userId, "");
-            if (msReports.size() < 4) {
-                model.put("collor", "red");
-                model.put("collor2", "red");
-                model.put("into", "不可复工");
-                model.put("errorMsg", "由于您前3日未连续报告日报，不可复工，如有疑问请联系直管领导。");
-                return new ModelAndView("/user/returnWorkHC.ftl", model);
-            }
-            List<MsReport> msReports2 = msReportMapper.selectMsReportThereError(userId,"");
-            if (msReports2.size() > 0) {
-                model.put("collor", "red");
-                model.put("collor2", "red");
-                model.put("into", "不可复工");
-                model.put("errorMsg", "由于近期您健康评估存在问题，不可复工，如有疑问请联系直管领导。");
-                return new ModelAndView("/user/returnWorkHC.ftl", model);
-            }
-            List<MsReport> msReports3 = msReportMapper.selectMsReportThereErrorFamily(userId, "");
-            if (msReports3.size() > 0) {
-                model.put("collor", "red");
-                model.put("collor2", "red");
-                model.put("into", "不许进入");
-                model.put("errorMsg", "由于近期您的家庭成员健康评估存在问题，不许进入，如有疑问请联系直管领导。");
-                return new ModelAndView("/user/returnWorkHC.ftl", model);
-            }
-            model.put("collor", "blue-ly");
-            model.put("collor2", "blue-ly");
-            model.put("into", "允许复工");
-            model.put("errorMsg", "声明：复工许可证是根据员工自主填写健康日报，结合湖北和昌新材料科技股份有限公司复工条件自动产生。原则上代表员工可以复工，在厂门口扫描二维码生成绿色复工通行证，并接受规定检查后，方可入厂。");
-            return new ModelAndView("/user/returnWorkHC.ftl", model);
         } else {
             model.put("into", "此功能暂未开放");
             model.put("errorMsg", "复工期间请请注意安全。");
@@ -889,9 +812,9 @@ public class ScanController {
         return time.substring(0, time.length() - 1);
     }
 
-    public String day15(Date returnWork) {
+    public String dayHow(Date returnWork, int day) {
         SimpleDateFormat sdf = new SimpleDateFormat("MM月dd日");
-        return sdf.format(new Date(returnWork.getTime() + 1000L * 3600 * 24 * 15));
+        return sdf.format(new Date(returnWork.getTime() + 1000L * 3600 * 24 * day));
     }
 
     public String day15(List<MsReport> list, String returnWork) throws ParseException {
@@ -907,7 +830,7 @@ public class ScanController {
     }
 
     public String domain() {
-        if (domain.substring(domain.length()-1).equals("/")) {
+        if (domain.substring(domain.length() - 1).equals("/")) {
             return domain;
         } else {
             return domain + "/";

whepi-web/src/main/java/com/bofeng/wx/controller/UserOpenController.java

@@ -90,7 +90,7 @@ public class UserOpenController {
                 model.put("uptown_id", "\"" + uptown_id + "\"");
                 model.put("uptownId", uptown_id);
                 model.put("uptown_name", uptown_name);
-                // 凌云集团的可以更改unit
+                // 江中耀华的可以更改unit
                 if (uptown_id == 1238790987234L || uptown_id == 5L || uptown_id == 100000002L) {
                     UptownUnit unit = uptownUnitMapper.getUptownUnitByUser(userId);
                     model.put("ridgepole", unit.getRidgepole());
@@ -130,7 +130,7 @@ public class UserOpenController {
                 model.put("uptown_id", "\"" + uptown_id + "\"");
                 model.put("uptownId", uptown_id);
                 model.put("uptown_name", uptown_name);
-                // 凌云集团的可以更改unit
+                // 江中耀华的可以更改unit
                 if (uptown_id == 1238790987234L || uptown_id == 5L || uptown_id == 100000002L) {
                     UptownUnit unit = uptownUnitMapper.getUptownUnitByUser(userId);
                     model.put("ridgepole", unit.getRidgepole());
@@ -180,7 +180,7 @@ public class UserOpenController {
                 model.put("uptown_id", "\"" + uptown_id + "\"");
                 model.put("uptownId", uptown_id);
                 model.put("uptown_name", uptown_name);
-                // 凌云集团的可以更改unit
+                // 江中耀华的可以更改unit
                 if (uptown_id == 1238790987234L || uptown_id == 5L || uptown_id == 100000002L) {
                     UptownUnit unit = uptownUnitMapper.getUptownUnitByUser(userId);
                     model.put("ridgepole", unit.getRidgepole());
@@ -221,7 +221,7 @@ public class UserOpenController {
                 model.put("uptown_id", "\"" + uptown_id + "\"");
                 model.put("uptownId", uptown_id);
                 model.put("uptown_name", uptown_name);
-                // 凌云集团的可以更改unit
+                // 江中耀华的可以更改unit
                 if (uptown_id == 1238790987234L || uptown_id == 5L || uptown_id == 100000002L) {
                     UptownUnit unit = uptownUnitMapper.getUptownUnitByUser(userId);
                     model.put("ridgepole", unit.getRidgepole());
@@ -302,7 +302,7 @@ public class UserOpenController {
                 model.put("uptown_id", "\"" + uptown_id + "\"");
                 model.put("uptownId", uptown_id);
                 model.put("uptown_name", uptown_name);
-                // 凌云集团的可以更改unit
+                // 江中耀华的可以更改unit
                 if (uptown_id == 1238790987234L || uptown_id == 5L || uptown_id == 100000002L) {
                     UptownUnit unit = uptownUnitMapper.getUptownUnitByUser(userId);
                     model.put("ridgepole", unit.getRidgepole());
@@ -348,7 +348,7 @@ public class UserOpenController {
     }
 
     /**
-     * 凌云集团公司信息
+     * 江中耀华公司信息
      *
      * @return
      */
@@ -382,7 +382,7 @@ public class UserOpenController {
 
 
     /**
-     * 凌云集团更改部门
+     * 江中耀华更改部门
      *
      * @return
      */
@@ -395,7 +395,7 @@ public class UserOpenController {
     }
 
     /**
-     * 凌云集团更改工号
+     * 江中耀华更改工号
      *
      * @return
      */

whepi-web/src/main/resources/mapper/RbMapper.xml

@@ -31,7 +31,7 @@
     </select>
 
     <select id="exSelectLingyunUser" resultType="com.bofeng.entity.ExcelRiBaoLYBM4">
-        select suu.ridgepole,suu.unit,suh.doorplate,suho.linkman,suho.phone,msr.safety_num as safetyNum, msr.report_status as reportStatus,
+        select suu.ridgepole,suu.unit,suh.doorplate,suho.linkman,suho.work_addr as workAddr,suho.phone,msr.safety_num as safetyNum, msr.report_status as reportStatus,
         msr.sure_num as sureNum,msr.suspected_num as suspectedNum,msr.normal_num as normalNum,msr.ms_status as msStatus,op.old_open_id as oldOpenId,
         msr.single_num as singleNum,mss.user_name as userName,mss.grender, mss.age,mss.family_status as familyStatus,de.department_name as departmentName,
         mss.medical,mss.temperature,mss.cough,mss.muscle ,mss.dyspnea,mss.fatigue,mss.diarrhea,mss.single_room as singleRoom,mss.score_rezult,mss.is_contact,mss.is_suspected,
@@ -162,7 +162,7 @@
     </select>
 
     <select id="exSelectLingyunUserPage" resultType="com.bofeng.entity.ExcelRiBaoLYBM4">
-        select suu.ridgepole,suu.unit,suh.doorplate,suho.linkman,suho.phone,msr.safety_num as safetyNum, msr.report_status as reportStatus,
+        select suu.ridgepole,suu.unit,suh.doorplate,suho.linkman,suho.work_addr as workAddr,suho.phone,msr.safety_num as safetyNum, msr.report_status as reportStatus,
         msr.sure_num as sureNum,msr.suspected_num as suspectedNum,msr.normal_num as normalNum,msr.ms_status as msStatus,op.old_open_id as oldOpenId,
         msr.single_num as singleNum,mss.user_name as userName,mss.grender, mss.age,mss.family_status as familyStatus,de.department_name as departmentName,
         mss.medical,mss.temperature,mss.cough,mss.is_contact, mss.is_suspected,mss.muscle ,mss.dyspnea,mss.fatigue,mss.diarrhea,mss.single_room as singleRoom,mss.score_rezult,mss.temperature_score,mss.is_contact as isContact,mss.is_suspected as isSuspected,