Browse Source

优化物业手机端首页统计

wuxw 2 years ago
parent
commit
74728c5c54

+ 30 - 18
java110-bean/src/main/java/com/java110/dto/workType/WorkTypeDto.java

@@ -1,6 +1,7 @@
 package com.java110.dto.workType;
 
 import com.java110.dto.PageDto;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -15,11 +16,11 @@ import java.util.Date;
 public class WorkTypeDto extends PageDto implements Serializable {
 
     private String typeName;
-private String remark;
-private String communityId;
-private String storeId;
-private String timeout;
-private String wtId;
+    private String remark;
+    private String communityId;
+    private String storeId;
+    private String smsWay;
+    private String wtId;
 
 
     private Date createTime;
@@ -30,37 +31,48 @@ private String wtId;
     public String getTypeName() {
         return typeName;
     }
-public void setTypeName(String typeName) {
+
+    public void setTypeName(String typeName) {
         this.typeName = typeName;
     }
-public String getRemark() {
+
+    public String getRemark() {
         return remark;
     }
-public void setRemark(String remark) {
+
+    public void setRemark(String remark) {
         this.remark = remark;
     }
-public String getCommunityId() {
+
+    public String getCommunityId() {
         return communityId;
     }
-public void setCommunityId(String communityId) {
+
+    public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
-public String getStoreId() {
+
+    public String getStoreId() {
         return storeId;
     }
-public void setStoreId(String storeId) {
+
+    public void setStoreId(String storeId) {
         this.storeId = storeId;
     }
-public String getTimeout() {
-        return timeout;
+
+    public String getSmsWay() {
+        return smsWay;
     }
-public void setTimeout(String timeout) {
-        this.timeout = timeout;
+
+    public void setSmsWay(String smsWay) {
+        this.smsWay = smsWay;
     }
-public String getWtId() {
+
+    public String getWtId() {
         return wtId;
     }
-public void setWtId(String wtId) {
+
+    public void setWtId(String wtId) {
         this.wtId = wtId;
     }
 

+ 37 - 23
java110-bean/src/main/java/com/java110/po/workType/WorkTypePo.java

@@ -17,6 +17,7 @@ package com.java110.po.workType;
 
 import java.io.Serializable;
 import java.util.Date;
+
 /**
  * 类表述: Po 数据模型实体对象 基本保持与数据库模型一直 用于 增加修改删除 等时的数据载体
  * add by 吴学文 at 2023-12-25 15:00:50 mail: 928255095@qq.com
@@ -28,55 +29,68 @@ import java.util.Date;
 public class WorkTypePo implements Serializable {
 
     private String typeName;
-private String remark;
-private String statusCd = "0";
-private String communityId;
-private String storeId;
-private String timeout;
-private String wtId;
-public String getTypeName() {
+    private String remark;
+    private String statusCd = "0";
+    private String communityId;
+    private String storeId;
+    private String smsWay ;
+    private String wtId;
+
+    public String getTypeName() {
         return typeName;
     }
-public void setTypeName(String typeName) {
+
+    public void setTypeName(String typeName) {
         this.typeName = typeName;
     }
-public String getRemark() {
+
+    public String getRemark() {
         return remark;
     }
-public void setRemark(String remark) {
+
+    public void setRemark(String remark) {
         this.remark = remark;
     }
-public String getStatusCd() {
+
+    public String getStatusCd() {
         return statusCd;
     }
-public void setStatusCd(String statusCd) {
+
+    public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
-public String getCommunityId() {
+
+    public String getCommunityId() {
         return communityId;
     }
-public void setCommunityId(String communityId) {
+
+    public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
-public String getStoreId() {
+
+    public String getStoreId() {
         return storeId;
     }
-public void setStoreId(String storeId) {
+
+    public void setStoreId(String storeId) {
         this.storeId = storeId;
     }
-public String getTimeout() {
-        return timeout;
+
+    public String getSmsWay() {
+        return smsWay;
     }
-public void setTimeout(String timeout) {
-        this.timeout = timeout;
+
+    public void setSmsWay(String smsWay) {
+        this.smsWay = smsWay;
     }
-public String getWtId() {
+
+    public String getWtId() {
         return wtId;
     }
-public void setWtId(String wtId) {
+
+    public void setWtId(String wtId) {
         this.wtId = wtId;
     }
 
 
-
 }

+ 9 - 9
java110-db/src/main/resources/mapper/oa/WorkTypeV1ServiceDaoImplMapper.xml

@@ -8,9 +8,9 @@
     <!-- 保存工作类型信息 add by wuxw 2018-07-03 -->
     <insert id="saveWorkTypeInfo" parameterType="Map">
         insert into work_type(
-        type_name,remark,community_id,store_id,timeout,wt_id
+        type_name,remark,community_id,store_id,sms_way,wt_id
         ) values (
-        #{typeName},#{remark},#{communityId},#{storeId},#{timeout},#{wtId}
+        #{typeName},#{remark},#{communityId},#{storeId},#{smsWay},#{wtId}
         )
     </insert>
 
@@ -18,7 +18,7 @@
     <!-- 查询工作类型信息 add by wuxw 2018-07-03 -->
     <select id="getWorkTypeInfo" parameterType="Map" resultType="Map">
         select t.type_name,t.type_name typeName,t.remark,t.status_cd,t.status_cd statusCd,t.community_id,t.community_id
-        communityId,t.store_id,t.store_id storeId,t.timeout,t.wt_id,t.wt_id wtId,t.create_time createTime
+        communityId,t.store_id,t.store_id storeId,t.sms_way smsWay,t.wt_id,t.wt_id wtId,t.create_time createTime
         from work_type t
         where 1 =1
         <if test="typeName !=null and typeName != ''">
@@ -36,8 +36,8 @@
         <if test="storeId !=null and storeId != ''">
             and t.store_id= #{storeId}
         </if>
-        <if test="timeout !=null and timeout != ''">
-            and t.timeout= #{timeout}
+        <if test="smsWay !=null and smsWay != ''">
+            and t.sms_way= #{smsWay}
         </if>
         <if test="wtId !=null and wtId != ''">
             and t.wt_id= #{wtId}
@@ -63,8 +63,8 @@
             , t.remark= #{remark}
         </if>
 
-        <if test="timeout !=null and timeout != ''">
-            , t.timeout= #{timeout}
+        <if test="smsWay !=null and smsWay != ''">
+            , t.sms_way= #{smsWay}
         </if>
         where 1=1
         <if test="wtId !=null and wtId != ''">
@@ -99,8 +99,8 @@
         <if test="storeId !=null and storeId != ''">
             and t.store_id= #{storeId}
         </if>
-        <if test="timeout !=null and timeout != ''">
-            and t.timeout= #{timeout}
+        <if test="smsWay !=null and smsWay != ''">
+            and t.sms_way= #{smsWay}
         </if>
         <if test="wtId !=null and wtId != ''">
             and t.wt_id= #{wtId}

+ 3 - 4
java110-interface/src/main/java/com/java110/intf/oa/IWorkTypeV1InnerServiceSMO.java

@@ -39,18 +39,17 @@ public interface IWorkTypeV1InnerServiceSMO {
 
 
     @RequestMapping(value = "/saveWorkType", method = RequestMethod.POST)
-    public int saveWorkType(@RequestBody  WorkTypePo workTypePo);
+    int saveWorkType(@RequestBody WorkTypePo workTypePo);
 
     @RequestMapping(value = "/updateWorkType", method = RequestMethod.POST)
-    public int updateWorkType(@RequestBody  WorkTypePo workTypePo);
+    int updateWorkType(@RequestBody WorkTypePo workTypePo);
 
     @RequestMapping(value = "/deleteWorkType", method = RequestMethod.POST)
-    public int deleteWorkType(@RequestBody  WorkTypePo workTypePo);
+    int deleteWorkType(@RequestBody WorkTypePo workTypePo);
 
     /**
      * <p>查询小区楼信息</p>
      *
-     *
      * @param workTypeDto 数据对象分享
      * @return WorkTypeDto 对象数据
      */

+ 1 - 1
service-oa/src/main/java/com/java110/oa/cmd/workType/SaveWorkTypeCmd.java

@@ -56,7 +56,7 @@ public class SaveWorkTypeCmd extends Cmd {
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "typeName", "请求报文中未包含typeName");
-        Assert.hasKeyAndValue(reqJson, "timeout", "请求报文中未包含timeout");
+        Assert.hasKeyAndValue(reqJson, "smsWay", "请求报文中未包含smsWay");
         Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含communityId");
         String storeId = CmdContextUtils.getStoreId(cmdDataFlowContext);
         reqJson.put("storeId",storeId);