凌云集团更改公司

whepi-ui/templates/home/home.ftl

@@ -60,6 +60,7 @@
         family_init();
         ribao_add();
         ribao_cancel();
+        getUptownUnitLY();
 
         <#if msReport ??>var msReport = ${msReport}</#if>;
         $('#ribao_jinrijujian').append(msReport.safetyNum);
@@ -113,6 +114,56 @@
         }
     })(jQuery);
 
+    // 凌云更换单位
+    function getUptownUnitLY() {
+        $.ajax({
+            type: "GET",
+            url: "/home/getUptownUnitLY.json",
+            data: {},
+            dataType: "json",
+            success: function (data) {
+                if (data.length > 0) {
+                    $("#newUnitId").empty();
+                    $('#newUnitId').append("<option>请选择</option>");
+                    var html = "";
+                    for (var i = 0; i < data.length; i++) {
+                        html += '<option value="' + data[i].unitId + '">'+data[i].ridgepole+data[i].unit + '</option>';
+                    }
+                    $('#newUnitId').append(html);
+                    $("#newUnitId").val('0');
+                }
+            }
+        });
+    }
+
+    // 凌云更换单位后保存
+    function changeUnitId() {
+        var unitId = $("#unitId").val();
+        var newUnitId = $("#newUnitId").val();
+        var newUnitText = $("#newUnitId").find("option:selected").text();
+        if (!newUnitId || newUnitId=="请选择") {
+            $.alert("请选择部门")
+            return false;
+        }
+        if (newUnitId==unitId) {
+            $.alert("您选择的部门和原来的部门一样")
+            return false;
+        }
+        $("#unitId").val(newUnitId);
+        $("#unitMsg").text(newUnitText);
+        $.ajax({
+            url: '/home/changeUnitId.json',
+            type: "post",
+            data: {
+                userId: $('#userId').val(),
+                newUnitId: newUnitId,
+            },success: function (date) {
+                $("#unitId").val(newUnitId);
+                $("#unitMsg").text(newUnitText);
+            }
+        });
+    }
+
 
     //小区求助信息的展示
     function familyClick() {

whepi-ui/templates/home/ribao.ftl

@@ -7,6 +7,11 @@
             <a class="weui-navbar__item" target="#rb_nav2" module="ri_bao">
                 健康日历
             </a>
+            <#if (uptownId??) && (uptownId == 11238790987234)>
+            <a class="weui-navbar__item" target="#rb_nav3" module="ri_bao">
+                更改部门
+            </a>
+            </#if>
         </div>
         <div class="weui-tab__panel">
             <div id="rb_nav1" class="weui-tab__bd-item ri_bao_weui_tab_bd_item_active">
@@ -221,6 +226,28 @@
                     <br/><br/>
                 </div>
             </div>
+            <div id="rb_nav3" class="weui-tab__bd-item ">
+                <div class="weui-panel weui-panel_access">
+<#--                    <div class="weui-panel__hd" style=" font-size: large">${uptown_name!''}小区</div>-->
+                    <div class="weui-panel__hd" style=" font-size: large">${linkman!''}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;工号${doorplate!''}</div>
+                    <div class="weui-panel__hd" style=" font-size: large"><span id="unitMsg">${ridgepole!''}${unit!''}</span></div>
+                    <input id="unitId" type="text" hidden="hidden" value="${unitId!''}"/>
+                    <div class="weui-cell weui-cell_select weui-cell_select-after">
+                        <div class="weui-cell__hd">
+                            <label for="" class="weui-label" id="danweiTitle">更换部门</label>
+                        </div>
+                        <div class="weui-cell__bd">
+                            <select class="weui-select" id="newUnitId">
+                                <option>请选择</option>
+                            </select>
+                        </div>
+                    </div>
+                    <div class="weui-form__opr-area">
+                        <a class="weui-btn weui-btn_primary" href="javascript:;" onclick="changeUnitId();">确定</a>
+                    </div>
+                    <br/><br/>
+                </div>
+            </div>
         </div>
     </div>
 </div>

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

@@ -18,4 +18,7 @@ public interface UptownHouseMapper extends BaseMapper<UptownHouse> {
 
     @Select("select * from sys_uptown_house where status = 1 and unit_id = #{unitId} and doorplate = #{doorplate}")
     List<UptownHouse> getUptownHouseBy(@Param("unitId") Long unitId, @Param("doorplate") String doorplate);
+
+    @Select("select uh.* from sys_uptown_house uh INNER JOIN sys_user_role ur on ur.property_id = uh.house_id where ur.user_id = #{userId} and ur.role_id = 1")
+    UptownHouse getUptownHouseByUser(@Param("userId") Long userId);
 }

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

@@ -35,8 +35,11 @@ public interface UptownUnitMapper extends BaseMapper<UptownUnit> {
 
     List<UptownUnit> queryYiChangList(@Param("uptownId") Long uptownId, @Param("reportDate") String reportDate);
 
-    @Select("SELECT u.uptown_id,u.uptown_name as uptownName,uu.ridgepole,uu.unit,uh.doorplate FROM sys_user_role ur INNER JOIN sys_uptown_house uh " +
+    @Select("SELECT u.uptown_id,u.uptown_name as uptownName,uu.ridgepole,uu.unit,uu.unit_id,uh.doorplate FROM sys_user_role ur INNER JOIN sys_uptown_house uh " +
             "ON uh.house_id = ur.property_id INNER JOIN sys_uptown_unit uu ON uh.unit_id = uu.unit_id INNER JOIN " +
             "sys_uptown u ON u.uptown_id = uu.uptown_id WHERE ur.user_id = #{userId} AND ur.role_id = 1")
     UptownUnit getUptownUnitByUser(@Param("userId") Long userId);
+
+    @Select("select * from sys_uptown_unit where status = 1 and uptown_id = 1238790987234 and unit_id > 190000 and unit_id < 191000")
+    List<UptownUnit> getUptownUnitLY();
 }

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

@@ -103,4 +103,11 @@ public class UserOpenService {
 //        }
         userRoleMapper.insert(userRole);
     }
+
+    @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
+    public void changeUnitId(Long userId, Long unitId) {
+        UptownHouse uptownHouse = uptownHouseMapper.getUptownHouseByUser(userId);
+        uptownHouse.setUnitId(unitId);
+        uptownHouseMapper.updateById(uptownHouse);
+    }
 }

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

@@ -78,7 +78,18 @@ public class UserOpenController {
                 Long uptown_id = uptowns.get(0).getUptownId();
                 String uptown_name = uptowns.get(0).getUptownName();
                 model.put("uptown_id", "\"" + uptown_id + "\"");
+                model.put("uptownId", uptown_id);
                 model.put("uptown_name", uptown_name);
+                // 凌云集团的可以更改unit
+                if (uptown_id == 1238790987234L) {
+                    UptownUnit unit = uptownUnitMapper.getUptownUnitByUser(userId);
+                    model.put("ridgepole", unit.getRidgepole());
+                    model.put("unit", unit.getUnit());
+                    model.put("unitId", unit.getUnitId());
+                    model.put("doorplate", unit.getDoorplate());
+                    List<UptownHome> uptownHomes =  uptownHomeMapper.getUptownHomeByUserId(userOpen.getUserId());
+                    model.put("linkman", uptownHomes.get(0).getLinkman());
+                }
             }
 
 
@@ -161,7 +172,18 @@ public class UserOpenController {
                 Long uptown_id = uptowns.get(0).getUptownId();
                 String uptown_name = uptowns.get(0).getUptownName();
                 model.put("uptown_id", "\"" + uptown_id + "\"");
+                model.put("uptownId", uptown_id);
                 model.put("uptown_name", uptown_name);
+                // 凌云集团的可以更改unit
+                if (uptown_id == 1238790987234L) {
+                    UptownUnit unit = uptownUnitMapper.getUptownUnitByUser(userId);
+                    model.put("ridgepole", unit.getRidgepole());
+                    model.put("unit", unit.getUnit());
+                    model.put("unitId", unit.getUnitId());
+                    model.put("doorplate", unit.getDoorplate());
+                    List<UptownHome> uptownHomes =  uptownHomeMapper.getUptownHomeByUserId(userId);
+                    model.put("linkman", uptownHomes.get(0).getLinkman());
+                }
             }
             if (userType == 1) {
                 MsReport msReport = msReportService.getReportByDateNow(userId);
@@ -195,6 +217,26 @@ public class UserOpenController {
         return uptownUnitMapper.getUptownUnitData(uptownId);
     }
 
+    /**
+     * 凌云集团公司信息
+     * @return
+     */
+    @GetMapping("/home/getUptownUnitLY.json")
+    public List<UptownUnit> getUptownUnitLY(HttpServletRequest request) {
+        return uptownUnitMapper.getUptownUnitLY();
+    }
+
+    /**
+     * 凌云集团更改公司
+     * @return
+     */
+    @PostMapping("/home/changeUnitId.json")
+    public void changeUnitId(ModelMap model, HttpServletRequest request) {
+        Long userId = Long.parseLong(request.getParameter("userId"));
+        Long unitId = Long.parseLong(request.getParameter("newUnitId"));
+        userOpenService.changeUnitId(userId, unitId);
+    }
+
     @PostMapping("/home/checkHouseId.json")
     public ResultModel checkHouseId(HttpServletRequest request) {
         ResultModel resultModel = new ResultModel();

whepi-web/src/main/resources/application.yml

@@ -43,7 +43,7 @@ endpoints:
 #  whitelabel.enabled: false
 
 spring:
-  profiles.active: guojing
+  profiles.active: peig
 
   application:
     name: bofeng-web