采购按小区区分

java110-bean/src/main/java/com/java110/dto/resource/ResourceAuditFlowDto.java

@@ -28,6 +28,8 @@ public class ResourceAuditFlowDto extends OaWorkflowDto implements Serializable
     private String flowName;
     private String auditType;
 
+    private String communityId;
+
 
     private Date createTime;
 
@@ -98,4 +100,12 @@ public class ResourceAuditFlowDto extends OaWorkflowDto implements Serializable
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(String communityId) {
+        this.communityId = communityId;
+    }
 }

java110-bean/src/main/java/com/java110/po/resource/ResourceAuditFlowPo.java

@@ -35,6 +35,8 @@ public class ResourceAuditFlowPo implements Serializable {
     private String flowName;
     private String auditType;
 
+    private String communityId;
+
     public String getRafId() {
         return rafId;
     }
@@ -90,4 +92,12 @@ public class ResourceAuditFlowPo implements Serializable {
     public void setAuditType(String auditType) {
         this.auditType = auditType;
     }
+
+    public String getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(String communityId) {
+        this.communityId = communityId;
+    }
 }

java110-db/src/main/resources/mapper/store/ResourceAuditFlowV1ServiceDaoImplMapper.xml

@@ -8,9 +8,9 @@
     <!-- 保存物品流程信息 add by wuxw 2018-07-03 -->
     <insert id="saveResourceAuditFlowInfo" parameterType="Map">
         insert into resource_audit_flow(
-        raf_id,remark,store_id,flow_id,flow_name,audit_type
+        raf_id,remark,store_id,flow_id,flow_name,audit_type,community_id
         ) values (
-        #{rafId},#{remark},#{storeId},#{flowId},#{flowName},#{auditType}
+        #{rafId},#{remark},#{storeId},#{flowId},#{flowName},#{auditType},#{communityId}
         )
     </insert>
 
@@ -19,7 +19,7 @@
     <select id="getResourceAuditFlowInfo" parameterType="Map" resultType="Map">
         select t.raf_id,t.raf_id rafId,t.remark,t.status_cd,t.status_cd statusCd,t.store_id,t.store_id
         storeId,t.flow_id,t.flow_id flowId,t.flow_name,t.flow_name flowName,t.audit_type,t.audit_type auditType,
-        t.create_time createTime
+        t.create_time createTime,t.community_id communityId
         from resource_audit_flow t
         where 1 =1
         <if test="rafId !=null and rafId != ''">
@@ -34,6 +34,9 @@
         <if test="storeId !=null and storeId != ''">
             and t.store_id= #{storeId}
         </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{storeId}
+        </if>
         <if test="flowId !=null and flowId != ''">
             and t.flow_id= #{flowId}
         </if>
@@ -77,6 +80,9 @@
         <if test="storeId !=null and storeId != ''">
             and t.store_id= #{storeId}
         </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{storeId}
+        </if>
 
     </update>
 
@@ -106,6 +112,9 @@
         <if test="auditType !=null and auditType != ''">
             and t.audit_type= #{auditType}
         </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{storeId}
+        </if>
 
 
     </select>

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

@@ -52,6 +52,7 @@ public class DeleteResourceAuditFlowCmd extends Cmd {
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "rafId", "rafId不能为空");
+        Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含小区");
 
     }
 

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

@@ -23,6 +23,7 @@ import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
 import com.java110.intf.store.IResourceAuditFlowV1InnerServiceSMO;
 import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -57,6 +58,8 @@ public class ListResourceAuditFlowCmd extends Cmd {
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         super.validatePageInfo(reqJson);
+        Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含小区");
+
     }
 
     @Override

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

@@ -75,6 +75,7 @@ public class SaveResourceAuditFlowCmd extends Cmd {
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "auditType", "请求报文中未包含flowType");
         Assert.hasKeyAndValue(reqJson, "flowName", "请求报文中未包含flowType");
+        Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含小区");
 
     }
 

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

@@ -55,6 +55,7 @@ public class UpdateResourceAuditFlowCmd extends Cmd {
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "rafId", "rafId不能为空");
+        Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含小区");
 
     }