凌云集团更改公司

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

@@ -277,7 +277,8 @@ define(function (require) {
                   {
                     text: '导出正常复工人员', iconCls: 'fa fa-cloud-upload', onClick: function () {
                       var unitId = $form.formGet().unitId;
-                      window.open(api('/returnWork/exReturnWork?unitId='+unitId));
+                      var departmentId = $form.formGet().departmentId;
+                      window.open(api('/returnWork/exReturnWork?unitId='+unitId + '&departmentId=' + departmentId));
                     }
                   },
                   {

admin-ui/app/whepi/scan/specialPersonnelLYS2.js

@@ -75,7 +75,7 @@ define(function (require) {
                         name: 'queryProperties',
                         prompt: "联系人姓名/工号",
                         labelWidth: 'auto',
-                        events: {keydown: enterQueryGrid1}, width: 350
+                        events: {keydown: enterQueryGrid1}, width: 300
                     },
                     {xtype: 'hidden', name: 'unitId'},
                     {
@@ -101,7 +101,7 @@ define(function (require) {
                         name: 'phone',
                         prompt: "请输入完整的电话号码",
                         labelWidth: 'auto',
-                        events: {keydown: enterQueryGrid2}, width: 350
+                        events: {keydown: enterQueryGrid2}, width: 300
                     },
                 ]]
             };

admin-ui/app/whepi/scan/specialPersonnelLYSix.js

@@ -75,7 +75,7 @@ define(function (require) {
                         name: 'queryProperties',
                         prompt: "联系人姓名/工号",
                         labelWidth: 'auto',
-                        events: {keydown: enterQueryGrid1}, width: 350
+                        events: {keydown: enterQueryGrid1}, width: 300
                     },
                     {xtype: 'hidden', name: 'unitId'},
                     {
@@ -101,7 +101,7 @@ define(function (require) {
                         name: 'phone',
                         prompt: "请输入完整的电话号码",
                         labelWidth: 'auto',
-                        events: {keydown: enterQueryGrid2}, width: 350
+                        events: {keydown: enterQueryGrid2}, width: 300
                     },
                 ]]
             };

admin-ui/app/whepi/scan/specialPersonnelLYSixS.js

@@ -75,7 +75,7 @@ define(function (require) {
                         name: 'queryProperties',
                         prompt: "联系人姓名/工号",
                         labelWidth: 'auto',
-                        events: {keydown: enterQueryGrid1}, width: 350
+                        events: {keydown: enterQueryGrid1}, width: 300
                     },
                     {xtype: 'hidden', name: 'unitId'},
                     {
@@ -101,7 +101,7 @@ define(function (require) {
                         name: 'phone',
                         prompt: "请输入完整的电话号码",
                         labelWidth: 'auto',
-                        events: {keydown: enterQueryGrid2}, width: 350
+                        events: {keydown: enterQueryGrid2}, width: 300
                     },
                 ]]
             };

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

@@ -33,13 +33,16 @@ public class ReturnWorkLy {
     @ExcelProperty(value = "部门", index = 0)
     @TableField(exist = false)
     private String unit;
-    @ExcelProperty(value = "姓名", index = 1)
+    @ExcelProperty(value = "二级部门", index = 1)
+    @TableField(exist = false)
+    private String departmentName;
+    @ExcelProperty(value = "姓名", index = 2)
     @TableField(exist = false)
     private String linkman;
-    @ExcelProperty(value = "电话", index = 2)
+    @ExcelProperty(value = "电话", index = 3)
     @TableField(exist = false)
     private String phone;
-    @ExcelProperty(value = "工号", index = 3)
+    @ExcelProperty(value = "工号", index = 4)
     @TableField(exist = false)
     private String doorplate;
 }

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

@@ -121,13 +121,13 @@ public class ScanService {
                     }
                     Boolean ly2 = false;
                     String startDate = "";
-                    int intSize = 4;
+                    int intSize = 3;
                     OutUser outUser2 = outUserMapper.getOutUserByPhoneNotTime(5, opens.get(i).getLinkman(), Long.parseLong(opens.get(i).getPhone()));
                     if (outUser2 != null) {
                         ly2 = true;
                         startDate = s.format(outUser2.getStartDate());
-                        Long day = (new Date().getTime() - outUser2.getStartDate().getTime()) / (1000 * 60 * 60 * 24);
-                        intSize = Integer.parseInt(Long.toString(day)) < 4 ? Integer.parseInt(Long.toString(day)) : 4;
+                        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(opens.get(i).getUserId());
                     if (msReport != null) {

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

@@ -501,7 +501,9 @@ public class ScanAdminController {
     @ApiOperation("导出允许复工人员")
     @SneakyThrows
     @GetMapping("/whepi/returnWork/exReturnWork")
-    public void exReturnWork(HttpParameterParser parser,HttpServletResponse resp, @Pd(name = "unitId" , required = false, defaultValue = "0") Long unitId) {
+    public void exReturnWork(HttpParameterParser parser,HttpServletResponse resp,
+                             @Pd(name = "unitId" , required = false, defaultValue = "0") Long unitId,
+                             @Pd(name = "departmentId" , required = false, defaultValue = "0") Long departmentId) {
         Long userId = JwtHelper.getUserId();
         if (userId > 7000 && userId < 8000) {
             unitId = userId;
@@ -509,6 +511,7 @@ public class ScanAdminController {
         scanService.returnWorkLY(unitId);
         Map<String, Object> map = new HashMap<>();
         map.put("unitId", unitId);
+        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()));

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

@@ -22,13 +22,15 @@
     </select>
 
     <select id="exgetAllUser" resultType="com.bofeng.entity.ReturnWorkLy">
-        select u.rw_id,u.user_id as userId,su.uptown_name as uptownName,CONCAT(uu.ridgepole,uu.unit) as unit,uh.linkman,uh.phone,suh.doorplate
+        select u.rw_id,u.user_id as userId,su.uptown_name as uptownName,CONCAT(uu.ridgepole,uu.unit) as unit,
+        uh.linkman,uh.phone,suh.doorplate,de.department_name as departmentName
         from return_work_ly u
         left join sys_user_role ur on ur.user_id = u.user_id and ur.role_id = 1
         left join sys_uptown_home uh on uh.house_id = ur.property_id
         left join sys_uptown_house suh on suh.house_id = ur.property_id
         left join sys_uptown_unit uu on uu.unit_id = suh.unit_id
         left join sys_uptown su on su.uptown_id = uu.uptown_id
+        left join sys_department de on de.department_id = suh.department_id
         <where>
             <if test="queryProperties != null and queryProperties != ''">
                 (uh.phone = #{phone} or uh.linkman like concat('%',#{queryProperties},'%'))
@@ -36,6 +38,9 @@
             <if test="unitId != null and unitId !=''">
                 and uu.unit_id = #{unitId}
             </if>
+            <if test="departmentId != null and departmentId !=''">
+                and suh.department_id = #{departmentId}
+            </if>
         </where>
         order by uu.ridgepole,uu.unit,u.user_id desc
     </select>