加入 放行已办 待办查询接口

java110-bean/src/main/java/com/java110/dto/itemRelease/ItemReleaseDto.java

@@ -42,6 +42,8 @@ public class ItemReleaseDto extends ItemReleaseTypeDto implements Serializable {
 
     private Date createTime;
 
+    private String createUserId;
+
     private String statusCd = "0";
 
 
@@ -173,4 +175,12 @@ public class ItemReleaseDto extends ItemReleaseTypeDto implements Serializable {
     public void setIrIds(String[] irIds) {
         this.irIds = irIds;
     }
+
+    public String getCreateUserId() {
+        return createUserId;
+    }
+
+    public void setCreateUserId(String createUserId) {
+        this.createUserId = createUserId;
+    }
 }

java110-bean/src/main/java/com/java110/po/itemRelease/ItemReleasePo.java

@@ -41,6 +41,7 @@ public class ItemReleasePo implements Serializable {
     private String typeId;
     private String state;
     private String communityId;
+    private String createUserId;
 
 
     public String getApplyCompany() {
@@ -139,5 +140,11 @@ public class ItemReleasePo implements Serializable {
         this.communityId = communityId;
     }
 
+    public String getCreateUserId() {
+        return createUserId;
+    }
 
+    public void setCreateUserId(String createUserId) {
+        this.createUserId = createUserId;
+    }
 }

java110-db/src/main/resources/mapper/common/ItemReleaseV1ServiceDaoImplMapper.xml

@@ -7,9 +7,9 @@
     <!-- 保存放行管理信息 add by wuxw 2018-07-03 -->
     <insert id="saveItemReleaseInfo" parameterType="Map">
         insert into item_release(
-        apply_company,id_card,pass_time,car_num,remark,apply_person,ir_id,apply_tel,type_id,state,community_id
+        apply_company,id_card,pass_time,car_num,remark,apply_person,ir_id,apply_tel,type_id,state,community_id,create_user_id
         ) values (
-        #{applyCompany},#{idCard},#{passTime},#{carNum},#{remark},#{applyPerson},#{irId},#{applyTel},#{typeId},#{state},#{communityId}
+        #{applyCompany},#{idCard},#{passTime},#{carNum},#{remark},#{applyPerson},#{irId},#{applyTel},#{typeId},#{state},#{communityId},#{createUserId}
         )
     </insert>
 
@@ -19,7 +19,7 @@
         passTime,t.car_num,t.car_num carNum,t.remark,t.status_cd,t.status_cd statusCd,t.apply_person,t.apply_person
         applyPerson,t.ir_id,t.ir_id irId,t.apply_tel,t.apply_tel applyTel,t.type_id,t.type_id
         typeId,t.state,t.community_id,t.community_id communityId,irt.type_name typeName,irt.flow_id flowId,irt.flow_name flowName,
-        td.name stateName,t.create_time createTime,SUM(irr.amount) amount
+        td.name stateName,t.create_time createTime,SUM(irr.amount) amount,t.create_user_id createUserId
         from item_release t
         LEFT JOIN item_release_type irt on t.type_id = irt.type_id and irt.status_cd = '0' and irt.community_id = t.community_id
         left join t_dict td on t.state = td.status_cd and td.table_name = 'item_release' and td.table_columns = 'state'
@@ -64,6 +64,9 @@
         <if test="state !=null and state != ''">
             and t.state= #{state}
         </if>
+        <if test="createUserId !=null and createUserId != ''">
+            and t.create_user_id= #{createUserId}
+        </if>
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>
@@ -164,6 +167,10 @@
         <if test="state !=null and state != ''">
             and t.state= #{state}
         </if>
+        <if test="createUserId !=null and createUserId != ''">
+            and t.create_user_id= #{createUserId}
+        </if>
+
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>

service-common/src/main/java/com/java110/common/cmd/itemRelease/SaveItemReleaseCmd.java

@@ -193,6 +193,7 @@ public class SaveItemReleaseCmd extends Cmd {
         ItemReleasePo itemReleasePo = BeanConvertUtil.covertBean(reqJson, ItemReleasePo.class);
         itemReleasePo.setIrId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
         itemReleasePo.setState(ItemReleaseDto.STATE_WAIT);
+        itemReleasePo.setCreateUserId(userId);
         int flag = itemReleaseV1InnerServiceSMOImpl.saveItemRelease(itemReleasePo);
 
         if (flag < 1) {