Merge branch 'master' of http://gitlab.scsmile.cn/zxf/smart_gov_platform

base-manager/src/main/java/com/mortals/xhx/module/window/model/WindowEntity.java

@@ -35,38 +35,47 @@ public class WindowEntity extends WindowVo {
     /**
      * 窗口名称
      */
+    @Excel(name = "窗口名称")
     private String name;
     /**
      * 英语窗口名
      */
+    @Excel(name = "窗口英语名")
     private String englishName;
     /**
      * 区域
      */
+    @Excel(name = "用户名")
     private String region;
     /**
      * 英语区域
      */
+    @Excel(name = "用户名")
     private String englishRegion;
     /**
      * 窗口编号
      */
+    @Excel(name = "用户名")
     private String fromnum;
     /**
      * 红旗窗口 (1.是，0.否)
      */
+    @Excel(name = "红旗窗口",combo={"是","否"}, readConverterExp = "1=是,0=否")
     private Integer hongqi;
     /**
-     * 无人值守(1.是，)
+     * 无人值守(1.是)
      */
+    @Excel(name = "无人值守",combo={"是","否"}, readConverterExp = "1=是,0=否")
     private Integer duty;
     /**
      * 显示内容
      */
+    @Excel(name = "显示内容")
     private String dutyContent;
     /**
      * 显示英文
      */
+    @Excel(name = "显示英文")
     private String dutyEnglish;
     /**
      * 备注
@@ -75,18 +84,22 @@ public class WindowEntity extends WindowVo {
     /**
      * 楼栋
      */
+    @Excel(name = "楼栋",cellType= Excel.ColumnType.NUMERIC)
     private Integer building;
     /**
      * 楼层
      */
+    @Excel(name = "楼层",cellType= Excel.ColumnType.NUMERIC)
     private Integer level;
     /**
      * 名称描述
      */
+    @Excel(name = "名称描述")
     private String nameDesc;
     /**
      * 英文名称描述
      */
+    @Excel(name = "英文名称描述")
     private String englishNameDesc;
     @Override
     public int hashCode() {

base-manager/src/main/java/com/mortals/xhx/module/window/service/impl/WindowBusinessServiceImpl.java

@@ -68,7 +68,7 @@ public class WindowBusinessServiceImpl extends AbstractCRUDServiceImpl<WindowBus
                     item.setHallId(windowHallEntity.getHallId());
                     item.setHallName(windowHallEntity.getHallName());
                 }else {
-                    log.info("windowhallEntity is null windowId:{}",item.getWindowId());
+                    //log.info("windowhallEntity is null windowId:{}",item.getWindowId());
                 }
             } else {
                 iterator.remove();

base-manager/src/main/java/com/mortals/xhx/module/window/web/WindowController.java

@@ -11,10 +11,15 @@ import com.mortals.framework.util.DataUtil;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.framework.web.BasePhpCRUDJsonMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.module.dept.model.DeptEntity;
+import com.mortals.xhx.module.dept.service.DeptService;
 import com.mortals.xhx.module.matter.model.MatterEntity;
+import com.mortals.xhx.module.site.model.SiteEntity;
+import com.mortals.xhx.module.site.service.SiteService;
 import com.mortals.xhx.module.window.model.WindowEntity;
 import com.mortals.xhx.module.window.service.WindowBusinessService;
 import com.mortals.xhx.module.window.service.WindowService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -38,10 +43,15 @@ import static com.mortals.framework.ap.SysConstains.PAGEINFO_KEY;
  */
 @RestController
 @RequestMapping("window")
+@Slf4j
 public class WindowController extends BaseCRUDJsonBodyMappingController<WindowService, WindowEntity, Long> {
 
     @Autowired
     private ParamService paramService;
+    @Autowired
+    private SiteService siteService;
+    @Autowired
+    private DeptService deptService;
 
 
     public WindowController() {
@@ -49,6 +59,15 @@ public class WindowController extends BaseCRUDJsonBodyMappingController<WindowSe
         super.setModuleDesc("站点部门窗口");
     }
 
+    /**
+     *
+     */
+    @Override
+    @UnAuth
+    public void downloadTemplate() {
+        super.downloadTemplate();
+    }
+
     @Override
     protected void init(Map<String, Object> model, Context context) {
         this.addDict(model, "hongqi", paramService.getParamBySecondOrganize("Window", "hongqi"));
@@ -139,4 +158,37 @@ public class WindowController extends BaseCRUDJsonBodyMappingController<WindowSe
         return ret;
     }
 
+
+    /**
+     * @param list
+     * @param updateSupport
+     * @param context
+     * @throws AppException
+     */
+    @Override
+    public void doImportDataBefore(List<WindowEntity> list, boolean updateSupport, Context context) throws AppException {
+
+        String siteId = request.getParameter("siteId");
+        String deptId = request.getParameter("deptId");
+        log.info("siteId:{}", siteId);
+        SiteEntity siteEntity = null;
+        DeptEntity deptEntity = null;
+        if (!ObjectUtils.isEmpty(siteId)) {
+            siteEntity = siteService.get(Long.parseLong(siteId));
+        }
+
+        if (!ObjectUtils.isEmpty(deptId)) {
+            deptEntity = deptService.get(Long.parseLong(deptId));
+        }
+        for (WindowEntity windowEntity : list) {
+            if (!ObjectUtils.isEmpty(siteEntity)) {
+                windowEntity.setSiteId(siteEntity.getId());
+                windowEntity.setSiteName(siteEntity.getSiteName());
+            }
+            if (!ObjectUtils.isEmpty(deptEntity)) {
+                windowEntity.setDeptId(deptEntity.getId());
+                windowEntity.setDeptName(deptEntity.getName());
+            }
+        }
+    }
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/workman/web/WorkmanController.java

@@ -84,6 +84,16 @@ public class WorkmanController extends BaseCRUDJsonBodyMappingController<Workman
         super.init(model, context);
     }
 
+
+    /**
+     *
+     */
+    @Override
+    @UnAuth
+    public void downloadTemplate() {
+        super.downloadTemplate();
+    }
+
     /**
      * 工作人员登录
      */

base-manager/src/test/java/com/mortals/httpclient/system/system.http

@@ -5,7 +5,7 @@ Content-Type: application/json
 
 {
   "loginName":"admin",
-  "password":"xhx@yb888",
+  "password":"admin",
   "securityCode":"8888"
 }
 

base-manager/src/test/java/com/mortals/httpclient/window/WindowController.http

@@ -68,6 +68,13 @@ Accept: application/json
 GET {{baseUrl}}/window/delete?id={{Window_id}}
 Accept: application/json
 
+###模板导出
+POST {{baseUrl}}/window/downloadTemplate
+Content-Type: application/json
+Authorization: {{authToken}}
+
+
+
 
 
 

portal-manager-ui/admin/src/views/dataAdmin/components/networkGovernance/callRecordForm.vue

@@ -158,7 +158,7 @@ export default {
 				this.tHeader,
 				this.filterVal,
 				data,
-				"填单记录报表" + this.$moment().format("YYYYMMDDHHmmss")
+				"12345拨打记录报表" + this.$moment().format("YYYYMMDDHHmmss")
 			);
 			this.btnLoading = false;
 		},

portal-manager-ui/admin/src/views/dataAdmin/components/networkGovernance/letterRecordForm.vue

@@ -376,7 +376,7 @@ export default {
         tHeader,
         filterVal,
         data,
-        "填单记录报表" + this.$moment().format("YYYYMMDDHHmmss")
+        "12345写信记录报表" + this.$moment().format("YYYYMMDDHHmmss")
       );
       this.btnLoading = false;
     },

portal-manager-ui/admin/src/views/dataAdmin/components/queueCall/callRecord.vue

@@ -10,6 +10,18 @@
       </div>
       <span>
         <a-space>
+          <a-select v-model="searchForm.hallid">
+            <a-select-option value=""> 全部大厅 </a-select-option>
+            <a-select-option v-for="item in datingList" :key="item.id" :value="item.id">
+              {{ item.hallName }}
+            </a-select-option>
+          </a-select>
+          <a-select v-model="searchForm.sectionid">
+            <a-select-option value=""> 全部部门 </a-select-option>
+            <a-select-option v-for="item in bumenList" :key="item.id" :value="item.id">
+              {{ item.name }}
+            </a-select-option>
+          </a-select>
           <a-select v-model="searchForm.id">
             <a-select-option value=""> 全部设备 </a-select-option>
             <a-select-option v-for="item in deviceData" :key="item.id" :value="item.id">
@@ -126,6 +138,8 @@ import BusinessInfo from "./components/businessInfo.vue";
 import WorkpeopleInfo from "./components/workpeopleInfo.vue";
 import HandlingDetails from "./components/HandlingDetails.vue";
 import {
+  getDatingList,
+  getBumenList,
   getCalllist,
   getCallQueList,
   getBusinessEvent,
@@ -265,7 +279,13 @@ export default {
         style: "", // 状态
         time: [moment().format("YYYY-MM-DD"), moment().format("YYYY-MM-DD")], // 时间区间
         flownum: "", // 排号编码
+        hallid: "",
+        sectionid: ""
       },
+      // 大厅列表
+      datingList: [],
+      // 部门列表
+      bumenList: [],
       //状态
       style: [
         {
@@ -326,11 +346,25 @@ export default {
     HandlingDetails,
   },
   created() {
+    this.getDatingListArr();
+    this.getBumenListArr();
     this.getCalllistArr();
     this.getCallQueListArr();
   },
   mounted() { },
   methods: {
+    // 获取大厅列表
+    async getDatingListArr() {
+      await getDatingList({ page: 1, size: -1 }).then((res) => {
+        this.datingList = res.data.data;
+      });
+    },
+    // // 获取部门列表
+    async getBumenListArr() {
+      await getBumenList({ page: 1, size: -1 }).then((res) => {
+        this.bumenList = res.data.data;
+      });
+    },
     //重置按钮
     resetBtn() {
       this.tableSelectedKeys = [];
@@ -341,6 +375,8 @@ export default {
         style: "", // 状态
         time: [moment().format("YYYY-MM-DD"), moment().format("YYYY-MM-DD")], // 时间区间
         flownum: "", // 排号编码
+        hallid: "",
+        sectionid: ""
       };
       this.getCallQueListArr();
     },
@@ -504,6 +540,10 @@ export default {
 </script>
 
 <style lang="less" scoped>
+/deep/.ant-select {
+  width: 120px;
+}
+
 /deep/.ant-spin-container {
   display: block !important;
 }

portal-manager-ui/admin/src/views/thePlatformIsSet/components/APIServe/APIServe.vue

@@ -67,7 +67,12 @@ export default {
   data() {
     return {
       searchVal: "",
-      stepsList: [],
+      stepsList: [
+        {
+          id:'',
+          productName:'全部',
+        }
+      ],
       isSearch: false,
       active: 0,
 
@@ -86,13 +91,22 @@ export default {
       getProduct({
         page: 1,
         size: -1, //每页条数
-        productName: `%${this.searchVal}%`,
+        // productName: `%${this.searchVal}%`,
       }).then((res) => {
         let { code, data } = res;
         if (code == 1) {
           if (data.data.length) {
-            this.stepsList = data.data;
-            this.getApiDetail(data.data[0]);
+            let arr = [
+              {
+                id:'',
+                productName:'全部',
+              }
+            ]
+            data.data.forEach(item => {
+              arr.push(item)
+            });
+            this.stepsList = arr
+            this.getApiDetail(this.stepsList[0]);
           } else {
             this.curApiInfo = {};
           }
@@ -101,7 +115,7 @@ export default {
     },
 
     getApiDetail(item) {
-      getInterfaceList({ page: 1, size: -1, productId: item.id }).then(
+      getInterfaceList({ page: 1, size: -1, productId: item.id , interfaceName: `%${this.searchVal}%`,}).then(
         (res) => {
           let { code, data } = res;
           if (code == 1) {
@@ -115,8 +129,9 @@ export default {
       );
     },
     handleSearch() {
-      this.active = 0;
-      this.getServiceApiList();
+      // this.active = 0;
+      // this.getServiceApiList();
+      this.getApiDetail(this.stepsList[this.active])
 
       // this.isSearch = !this.isSearch;
       // if (this.isSearch) {

portal-manager-ui/admin/src/views/thePlatformIsSet/components/menuManagement/menuMgmt.vue

@@ -218,10 +218,12 @@ export default {
     // 搜索
     async searchData() {
       if (this.searchForm.parentId || this.searchForm.name) {
+        let obj = {...this.searchForm}
+        obj.name = '%'+this.searchForm.name+'%'
         let res = await menuList({
           page: this.tablePagination.current,
           size: -1,
-          ...this.searchForm,
+          ...obj,
         });
         let { data, total } = res.data;
         this.tablePagination.total = total;

portal-manager-ui/admin/src/views/thePlatformIsSet/components/productManage/productManage.vue

@@ -116,6 +116,7 @@ export default {
         this.$refs.AddEditAppName.appInfoFome.id = item.id;
         this.$refs.AddEditAppName.appInfoFome.productName = item.productName;
       } else {
+        this.$refs.AddEditAppName.appInfoFome.id = '';
         this.$refs.AddEditAppName.VisibleTitle = "新增产品";
       }
       this.$refs.AddEditAppName.Visible = true;