优化代码

java110-bean/src/main/java/com/java110/dto/menu/MenuDto.java

@@ -15,6 +15,7 @@ public class MenuDto extends PageDto implements Serializable {
     private String description;
     private String statusCd;
     private String gId;
+    private String gName;
     private String pId;
     private String pName;
     private String isShowName;
@@ -71,8 +72,6 @@ public class MenuDto extends PageDto implements Serializable {
         this.description = description;
     }
 
-
-
     public String getStatusCd() {
         return statusCd;
     }
@@ -152,4 +151,12 @@ public class MenuDto extends PageDto implements Serializable {
     public void setStoreTypeName(String storeTypeName) {
         this.storeTypeName = storeTypeName;
     }
+
+    public String getgName() {
+        return gName;
+    }
+
+    public void setgName(String gName) {
+        this.gName = gName;
+    }
 }

java110-bean/src/main/java/com/java110/dto/privilegeUser/PrivilegeUserDto.java

@@ -24,12 +24,10 @@ public class PrivilegeUserDto extends PageDto implements Serializable {
     private String userName;
     private String roleName;
 
-
     private Date createTime;
 
     private String statusCd = "0";
 
-
     public String getPrivilegeFlag() {
         return privilegeFlag;
     }
@@ -46,7 +44,6 @@ public class PrivilegeUserDto extends PageDto implements Serializable {
         this.puId = puId;
     }
 
-
     public String getStoreId() {
         return storeId;
     }
@@ -63,7 +60,6 @@ public class PrivilegeUserDto extends PageDto implements Serializable {
         this.userId = userId;
     }
 
-
     public Date getCreateTime() {
         return createTime;
     }

java110-bean/src/main/java/com/java110/vo/api/menu/ApiMenuDataVo.java

@@ -12,6 +12,7 @@ public class ApiMenuDataVo implements Serializable {
     private String isShow;
     private String description;
     private String gId;
+    private String gName;
     private String pId;
     private String pName;
 
@@ -144,4 +145,12 @@ public class ApiMenuDataVo implements Serializable {
     public void setStoreTypeName(String storeTypeName) {
         this.storeTypeName = storeTypeName;
     }
+
+    public String getgName() {
+        return gName;
+    }
+
+    public void setgName(String gName) {
+        this.gName = gName;
+    }
 }

java110-bean/src/main/java/com/java110/vo/api/staff/ApiStaffDataVo.java

@@ -46,7 +46,7 @@ public class ApiStaffDataVo implements Serializable {
 
     private String relCdName;
 
-
+    private String parentTwoOrgId;
 
     public String getUserId() {
         return userId;
@@ -223,4 +223,12 @@ public class ApiStaffDataVo implements Serializable {
     public void setOrgLevel(String orgLevel) {
         this.orgLevel = orgLevel;
     }
+
+    public String getParentTwoOrgId() {
+        return parentTwoOrgId;
+    }
+
+    public void setParentTwoOrgId(String parentTwoOrgId) {
+        this.parentTwoOrgId = parentTwoOrgId;
+    }
 }

java110-db/src/main/resources/mapper/community/FloorServiceDaoImplMapper.xml

@@ -267,7 +267,7 @@
         <if test="lift !=null and lift != ''">
             and bu.lift= #{lift}
         </if>
-        order by t.seq,bu.unit_num asc
+        order by t.seq,t.floor_num,bu.unit_num asc
         <!-- <if test="page != -1 and page != null ">
              limit #{page}, #{row}
          </if>limit 10;-->

java110-db/src/main/resources/mapper/community/MenuServiceDaoImplMapper.xml

@@ -222,7 +222,7 @@
     <select id="getMenuInfo" parameterType="Map" resultType="Map">
         select DISTINCT t.m_id mId,t.name,t.g_id gId,t.url,t.seq,t.p_id pId,t.description,t.is_show isShow,
         if(t.is_show='Y','显示','不显示') isShowName,
-        t.m_id pId,t.name pName,mg.name menuGroupName,mg.store_type,st.name storeTypeName
+        t.m_id pId,t.name pName,mg.name gName,mg.store_type,st.name storeTypeName
         from m_menu t,p_privilege p,m_menu_group mg,store_type st
         where t.status_cd= '0'
         and p.status_cd= '0'
@@ -232,6 +232,9 @@
         <if test="gId !=null and gId != ''">
             and t.g_id= #{gId}
         </if>
+        <if test="gName !=null and gName != ''">
+            and mg.name= #{gName}
+        </if>
         <if test="name !=null and name != ''">
             and t.name like concat('%',#{name},'%')
         </if>
@@ -333,6 +336,9 @@
         <if test="gId !=null and gId != ''">
             and t.g_id= #{gId}
         </if>
+        <if test="gName !=null and gName != ''">
+            and mg.name= #{gName}
+        </if>
         <if test="name !=null and name != ''">
             and t.name like concat('%',#{name},'%')
         </if>

java110-db/src/main/resources/mapper/community/RouteServiceDaoImplMapper.xml

@@ -90,6 +90,9 @@
         <if test="serviceUrl != null and serviceUrl != ''">
             and s.url = #{serviceUrl}
         </if>
+        <if test="appName != null and appName != ''">
+            and a.name = #{appName}
+        </if>
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
         </if>
@@ -155,5 +158,8 @@
         <if test="serviceUrl != null and serviceUrl != ''">
             and s.url = #{serviceUrl}
         </if>
+        <if test="appName != null and appName != ''">
+            and a.name = #{appName}
+        </if>
     </select>
 </mapper>

java110-db/src/main/resources/mapper/community/UnitServiceDaoImplMapper.xml

@@ -127,7 +127,7 @@
         <if test="userId !=null and userId != ''">
             and t.user_id= #{userId}
         </if>
-        order by ff.seq,t.unit_id asc
+        order by ff.seq,ff.floor_num,t.unit_num asc
        <!-- <if test="page != -1 and page != null ">
             limit #{page}, #{row}
         </if>limit 10;-->

java110-db/src/main/resources/mapper/community/VisitV1ServiceDaoImplMapper.xml

@@ -11,9 +11,9 @@
     <!-- 保存访客信息 add by wuxw 2018-07-03 -->
     <insert id="saveVisitInfo" parameterType="Map">
         insert into s_visit_info(
-departure_time,v_name,ps_id,visit_gender,owner_id,reason_type,user_id,state_remark,v_id,visit_time,phone_number,free_time,visit_case,state,community_id,entourage,record_state
+departure_time,v_name,ps_id,visit_gender,owner_id,reason_type,user_id,state_remark,v_id,visit_time,phone_number,free_time,visit_case,state,community_id,entourage,record_state,car_num,status_cd
 ) values (
-#{departureTime},#{vName},#{psId},#{visitGender},#{ownerId},#{reasonType},#{userId},#{stateRemark},#{vId},#{visitTime},#{phoneNumber},#{freeTime},#{visitCase},#{state},#{communityId},#{entourage},#{recordState}
+#{departureTime},#{vName},#{psId},#{visitGender},#{ownerId},#{reasonType},#{userId},#{stateRemark},#{vId},#{visitTime},#{phoneNumber},#{freeTime},#{visitCase},#{state},#{communityId},#{entourage},#{recordState},#{carNum},#{statusCd}
 )
     </insert>
 

java110-db/src/main/resources/mapper/fee/ReturnPayFeeServiceDaoImplMapper.xml

@@ -187,10 +187,10 @@
         <if test="payTime !=null and payTime != ''">
             and t.pay_time= #{payTime}
         </if>
-        <if test="startTime !=null ">
+        <if test="startTime !=null and startTime != ''">
             and t.create_time &gt;= #{startTime}
         </if>
-        <if test="endTime !=null ">
+        <if test="endTime !=null and endTime != ''">
             and t.create_time &lt;= #{endTime}
         </if>
         <if test="detailId !=null and detailId != ''">
@@ -495,10 +495,10 @@
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>
-        <if test="startTime !=null ">
+        <if test="startTime !=null and startTime !='' ">
             and t.create_time &gt;= #{startTime}
         </if>
-        <if test="endTime !=null ">
+        <if test="endTime !=null and endTime !=''">
             and t.create_time &lt;= #{endTime}
         </if>
     </select>

service-community/src/main/java/com/java110/community/cmd/ownerRepair/ListStaffFinishRepairsCmd.java

@@ -36,6 +36,9 @@ public class ListStaffFinishRepairsCmd extends Cmd {
     @Autowired
     private IMenuInnerServiceSMO menuInnerServiceSMOImpl;
 
+    //域
+    public static final String DOMAIN_COMMON = "DOMAIN.COMMON";
+
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
         super.validatePageInfo(reqJson);
@@ -47,7 +50,7 @@ public class ListStaffFinishRepairsCmd extends Cmd {
     public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
         RepairDto ownerRepairDto = BeanConvertUtil.covertBean(reqJson, RepairDto.class);
         String userId = reqJson.getString("userId");
-        String viewListStaffRepairs = MappingCache.getValue("viewListStaffRepairs");
+        String viewListStaffRepairs = MappingCache.getValue(DOMAIN_COMMON,"VIEW_LIST_STAFF_REPAIRS");
         List<Map> privileges = null;
         //这里加开关 其实让管理员看到所有单子这么做，不太优雅，建议 单独开发页面功能
         // 不要影响已办功能，add by 吴学文 2021-09-09
@@ -65,8 +68,8 @@ public class ListStaffFinishRepairsCmd extends Cmd {
             ownerRepairDto.setStates(Arrays.asList(states));
         } else {
             //Pc WEB维修已办
-//            String[] states={RepairDto.STATE_BACK, RepairDto.STATE_TRANSFER,RepairDto.STATE_PAY, RepairDto.STATE_PAY_ERROR, RepairDto.STATE_APPRAISE, RepairDto.STATE_RETURN_VISIT, RepairDto.STATE_COMPLATE};
-//            ownerRepairDto.setStates(Arrays.asList(states));
+            String[] states={RepairDto.STATE_BACK, RepairDto.STATE_TRANSFER,RepairDto.STATE_PAY, RepairDto.STATE_PAY_ERROR, RepairDto.STATE_APPRAISE, RepairDto.STATE_RETURN_VISIT, RepairDto.STATE_COMPLATE};
+            ownerRepairDto.setStates(Arrays.asList(states));
         }
         int count = repairInnerServiceSMOImpl.queryStaffFinishRepairsCount(ownerRepairDto);
         List<RepairDto> ownerRepairs = null;

service-dev/src/main/java/com/java110/dev/cmd/menu/ListMenusCmd.java

@@ -24,7 +24,6 @@ public class ListMenusCmd extends Cmd {
     @Autowired
     private IMenuInnerServiceSMO menuInnerServiceSMOImpl;
 
-
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
         super.validatePageInfo(reqJson);

service-store/src/main/java/com/java110/store/cmd/resourceStore/ListResourceStoresCmd.java

@@ -68,6 +68,7 @@ public class ListResourceStoresCmd extends Cmd {
         if (count > 0) {
             resourceStores = BeanConvertUtil.covertBeanList(resourceStoreInnerServiceSMOImpl.queryResourceStores(resourceStoreDto), ApiResourceStoreDataVo.class);
             //查询总价
+            resourceStoreDto.setPage(Integer.valueOf(reqJson.getString("page")));
             subTotalPrice = new BigDecimal(resourceStoreInnerServiceSMOImpl.queryResourceStoresTotalPrice(resourceStoreDto));
             resourceStoreDto.setPage(PageDto.DEFAULT_PAGE);
             totalPrice = new BigDecimal(resourceStoreInnerServiceSMOImpl.queryResourceStoresTotalPrice(resourceStoreDto));

service-user/src/main/java/com/java110/user/cmd/role/ListRoleStaffCmd.java

@@ -32,13 +32,14 @@ public class ListRoleStaffCmd extends Cmd {
     @Override
     public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
 
-
         String storeId = context.getReqHeaders().get("store-id");
 
         PrivilegeUserDto privilegeUserDto = new PrivilegeUserDto();
         privilegeUserDto.setpId(reqJson.getString("roleId"));
         privilegeUserDto.setStoreId(storeId);
         privilegeUserDto.setPrivilegeFlag(PrivilegeUserDto.PRIVILEGE_FLAG_GROUP);
+        privilegeUserDto.setPage(Integer.parseInt(reqJson.getString("page")));
+        privilegeUserDto.setRow(Integer.parseInt(reqJson.getString("row")));
 
         int count = privilegeUserV1InnerServiceSMOImpl.queryPrivilegeUserInfoCount(privilegeUserDto);
 

service-user/src/main/java/com/java110/user/cmd/user/QueryStaffInfosCmd.java

@@ -40,13 +40,13 @@ public class QueryStaffInfosCmd extends Cmd {
 
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
-        Assert.hasKeyAndValue(reqJson,"page","请求报文中未包含page节点");
-        Assert.hasKeyAndValue(reqJson,"row","请求报文中未包含rows节点");
+        Assert.hasKeyAndValue(reqJson, "page", "请求报文中未包含page节点");
+        Assert.hasKeyAndValue(reqJson, "row", "请求报文中未包含rows节点");
         if (!reqJson.containsKey("storeId")) {
             String storeId = context.getReqHeaders().get("store-id");
             reqJson.put("storeId", storeId);
         }
-        Assert.hasKeyAndValue(reqJson,"storeId","请求报文中未包含storeId节点");
+        Assert.hasKeyAndValue(reqJson, "storeId", "请求报文中未包含storeId节点");
     }
 
     @Override
@@ -60,7 +60,7 @@ public class QueryStaffInfosCmd extends Cmd {
         if (count > 0) {
             staffs = BeanConvertUtil.covertBeanList(userInnerServiceSMOImpl.getStaffs(userDto), ApiStaffDataVo.class);
             refreshInitials(staffs);
-            refreshOrgs(staffs,reqJson.getString("storeId"));
+            refreshOrgs(staffs, reqJson.getString("storeId"));
         } else {
             staffs = new ArrayList<>();
         }
@@ -76,13 +76,13 @@ public class QueryStaffInfosCmd extends Cmd {
         context.setResponseEntity(responseEntity);
     }
 
-    private void refreshOrgs(List<ApiStaffDataVo> staffs,String storeId) {
-        if(staffs == null ||  staffs.size()<1){
-            return ;
+    private void refreshOrgs(List<ApiStaffDataVo> staffs, String storeId) {
+        if (staffs == null || staffs.size() < 1) {
+            return;
         }
 
-        List<String>  staffIds  = new ArrayList<>();
-        for(ApiStaffDataVo apiStaffDataVo : staffs){
+        List<String> staffIds = new ArrayList<>();
+        for (ApiStaffDataVo apiStaffDataVo : staffs) {
             staffIds.add(apiStaffDataVo.getUserId());
         }
 
@@ -101,30 +101,34 @@ public class QueryStaffInfosCmd extends Cmd {
             return;
         }
 
-
-        for(ApiStaffDataVo apiStaffDataVo : staffs){
-            for(OrgStaffRelDto tmpOrgStaffRelDto : orgStaffRels){
-                if(!apiStaffDataVo.getUserId().equals(tmpOrgStaffRelDto.getStaffId())){
+        for (ApiStaffDataVo apiStaffDataVo : staffs) {
+            for (OrgStaffRelDto tmpOrgStaffRelDto : orgStaffRels) {
+                if (!apiStaffDataVo.getUserId().equals(tmpOrgStaffRelDto.getStaffId())) {
                     continue;
                 }
-               apiStaffDataVo.setOrgId(tmpOrgStaffRelDto.getOrgId());
+                OrgDto org = new OrgDto();
+                org.setOrgId(tmpOrgStaffRelDto.getOrgId());
+                List<OrgDto> orgs = orgV1InnerServiceSMOImpl.queryOrgs(org);
+                Assert.listOnlyOne(orgs, "查询组织表错误！");
+                apiStaffDataVo.setOrgId(tmpOrgStaffRelDto.getOrgId());
+                apiStaffDataVo.setParentTwoOrgId(orgs.get(0).getParentOrgId());
             }
         }
 
-        for(ApiStaffDataVo apiStaffDataVo : staffs) {
-            if(StringUtil.isEmpty(apiStaffDataVo.getOrgId())){
+        for (ApiStaffDataVo apiStaffDataVo : staffs) {
+            if (StringUtil.isEmpty(apiStaffDataVo.getOrgId())) {
                 continue;
             }
             apiStaffDataVo.setParentOrgId(apiStaffDataVo.getOrgId());
 
-            findParents(apiStaffDataVo, orgDtos, null,0);
+            findParents(apiStaffDataVo, orgDtos, null, 0);
 
         }
 
     }
 
 
-    private void findParents(ApiStaffDataVo apiStaffDataVo, List<OrgDto> orgDtos, OrgDto curOrgDto,int orgDeep) {
+    private void findParents(ApiStaffDataVo apiStaffDataVo, List<OrgDto> orgDtos, OrgDto curOrgDto, int orgDeep) {
         for (OrgDto orgDto : orgDtos) {
             curOrgDto = orgDto;
             if (!apiStaffDataVo.getParentOrgId().equals(orgDto.getOrgId())) { // 他自己跳过
@@ -132,14 +136,14 @@ public class QueryStaffInfosCmd extends Cmd {
             }
 
             //如果到一级 就结束
-            if(OrgDto.ORG_LEVEL_STORE.equals(apiStaffDataVo.getOrgLevel())){
+            if (OrgDto.ORG_LEVEL_STORE.equals(apiStaffDataVo.getOrgLevel())) {
                 continue;
             }
 
             apiStaffDataVo.setParentOrgId(orgDto.getParentOrgId());
 
             if (StringUtil.isEmpty(apiStaffDataVo.getOrgName())) {
-                apiStaffDataVo.setOrgName(orgDto.getOrgName() );
+                apiStaffDataVo.setOrgName(orgDto.getOrgName());
                 continue;
             }
             apiStaffDataVo.setOrgName(orgDto.getOrgName() + " / " + apiStaffDataVo.getOrgName());
@@ -158,26 +162,27 @@ public class QueryStaffInfosCmd extends Cmd {
             return;
         }
 
-        orgDeep +=1;
+        orgDeep += 1;
 
-        if(orgDeep > 20){
-            return ;
+        if (orgDeep > 20) {
+            return;
         }
 
-        findParents(apiStaffDataVo, orgDtos, curOrgDto,orgDeep);
+        findParents(apiStaffDataVo, orgDtos, curOrgDto, orgDeep);
     }
 
     /**
      * 刷入首字母
+     *
      * @param staffs
      */
     private void refreshInitials(List<ApiStaffDataVo> staffs) {
 
-        for(ApiStaffDataVo staffDataVo : staffs){
-            if(StringUtil.isEmpty(staffDataVo.getName())){
+        for (ApiStaffDataVo staffDataVo : staffs) {
+            if (StringUtil.isEmpty(staffDataVo.getName())) {
                 continue;
             }
-            staffDataVo.setInitials(PinYinUtil.getFirstSpell(staffDataVo.getName()).toUpperCase().charAt(0)+"");
+            staffDataVo.setInitials(PinYinUtil.getFirstSpell(staffDataVo.getName()).toUpperCase().charAt(0) + "");
         }
     }
 }