gaodd 2 年之前
父节点
当前提交
a0a1bb06af

+ 21 - 5
src/main/java/com/chinaitop/depot/business/mapper/BusinessNoticeReceiveMapper.xml

@@ -44,6 +44,7 @@
44 44
     <result column="audit_state" property="auditState" jdbcType="INTEGER" />
45 45
     <result column="is_notice" property="isNotice" jdbcType="INTEGER" />
46 46
     <result column="pzmc" property="pzmc" jdbcType="VARCHAR" />
47
+    <id column="is_sheet" property="isSheet" jdbcType="INTEGER" />
47 48
      
48 49
   </resultMap>
49 50
   <sql id="Example_Where_Clause" >
@@ -123,7 +124,7 @@
123 124
     id, notice_number, crktype, contract_number, ywtype, house_id, ware_house_id, grain_kind, 
124 125
     grain_grade, count, outgoing_period, forwarding_unit, receive_unit, resion, in_application, 
125 126
     org_id, grain_attribute, grain_detail_kind, receive_time,input_time,grain_annual,productive_year,grain_producing_area,
126
-    lsxzzbdh,lssl,hzqlsxzdm,hzrq,ccshr,zjshr,tjshr,kjshr,ldshr,bz,audit_state,is_notice,pzmc
127
+    lsxzzbdh,lssl,hzqlsxzdm,hzrq,ccshr,zjshr,tjshr,kjshr,ldshr,bz,audit_state,is_notice,pzmc,is_sheet
127 128
   </sql>
128 129
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.business.model.BusinessNoticeReceiveExample" >
129 130
     <!--
@@ -188,7 +189,7 @@
188 189
       receive_unit, resion, in_application, 
189 190
       org_id, grain_attribute, grain_detail_kind, 
190 191
       receive_time,input_time,grain_annual,productive_year,grain_producing_area,
191
-      lsxzzbdh,lssl,hzqlsxzdm,hzrq,ccshr,zjshr,tjshr,kjshr,ldshr,bz,audit_state,is_notice,pzmc)
192
+      lsxzzbdh,lssl,hzqlsxzdm,hzrq,ccshr,zjshr,tjshr,kjshr,ldshr,bz,audit_state,is_notice,pzmc,is_sheet)
192 193
     values (#{id,jdbcType=INTEGER}, #{noticeNumber,jdbcType=VARCHAR}, #{crktype,jdbcType=VARCHAR}, 
193 194
       #{contractNumber,jdbcType=VARCHAR}, #{ywtype,jdbcType=VARCHAR}, #{houseId,jdbcType=INTEGER}, 
194 195
       #{wareHouseId,jdbcType=INTEGER}, #{grainKind,jdbcType=INTEGER}, #{grainGrade,jdbcType=INTEGER}, 
@@ -200,7 +201,8 @@
200 201
       #{lsxzzbdh,jdbcType=VARCHAR},#{lssl,jdbcType=VARCHAR},#{hzqlsxzdm,jdbcType=INTEGER},
201 202
       #{hzrq,jdbcType=TIMESTAMP},#{ccshr,jdbcType=VARCHAR},#{zjshr,jdbcType=VARCHAR},
202 203
       #{tjshr,jdbcType=VARCHAR},#{kjshr,jdbcType=VARCHAR},#{ldshr,jdbcType=VARCHAR},
203
-      #{bz,jdbcType=VARCHAR},#{auditState,jdbcType=INTEGER},#{isNotice,jdbcType=INTEGER},#{pzmc,jdbcType=VARCHAR})
204
+      #{bz,jdbcType=VARCHAR},#{auditState,jdbcType=INTEGER},#{isNotice,jdbcType=INTEGER},#{pzmc,jdbcType=VARCHAR}
205
+      ,#{isSheet,jdbcType=INTEGER})
204 206
   </insert>
205 207
   <insert id="insertSelective" parameterType="com.chinaitop.depot.business.model.BusinessNoticeReceive" >
206 208
     <!--
@@ -318,6 +320,9 @@
318 320
       <if test="pzmc != null" >
319 321
         pzmc,
320 322
       </if>
323
+      <if test="isSheet != null" >
324
+        is_sheet,
325
+      </if>
321 326
       
322 327
     </trim>
323 328
     <trim prefix="values (" suffix=")" suffixOverrides="," >
@@ -429,6 +434,9 @@
429 434
       <if test="pzmc != null" >
430 435
          #{pzmc,jdbcType=VARCHAR},
431 436
       </if>
437
+      <if test="isSheet != null" >
438
+         #{isSheet,jdbcType=INTEGER},
439
+      </if>
432 440
     </trim>
433 441
   </insert>
434 442
   <select id="countByExample" parameterType="com.chinaitop.depot.business.model.BusinessNoticeReceiveExample" resultType="java.lang.Integer" >
@@ -559,6 +567,9 @@
559 567
       <if test="record.pzmc != null" >
560 568
         pzmc = #{record.pzmc,jdbcType=VARCHAR},
561 569
       </if>
570
+      <if test="record.isSheet != null" >
571
+        is_sheet = #{record.isSheet,jdbcType=INTEGER},
572
+      </if>
562 573
     </set>
563 574
     <if test="_parameter != null" >
564 575
       <include refid="Update_By_Example_Where_Clause" />
@@ -606,7 +617,8 @@
606 617
       bz = #{record.bz,jdbcType=VARCHAR},
607 618
       audit_state = #{record.auditState,jdbcType=INTEGER},
608 619
       is_notice = #{record.isNotice,jdbcType=INTEGER},
609
-      pzmc = #{record.pzmc,jdbcType=VARCHAR}
620
+      pzmc = #{record.pzmc,jdbcType=VARCHAR},
621
+      is_sheet = #{record.isSheet,jdbcType=INTEGER}
610 622
       
611 623
     <if test="_parameter != null" >
612 624
       <include refid="Update_By_Example_Where_Clause" />
@@ -726,6 +738,9 @@
726 738
       <if test="pzmc != null" >
727 739
         pzmc = #{pzmc,jdbcType=VARCHAR},
728 740
       </if>
741
+      <if test="isSheet != null" >
742
+        is_sheet = #{isSheet,jdbcType=INTEGER},
743
+      </if>
729 744
     </set>
730 745
     where id = #{id,jdbcType=INTEGER}
731 746
   </update>
@@ -770,7 +785,8 @@
770 785
       bz = #{bz,jdbcType=VARCHAR},
771 786
       audit_state = #{auditState,jdbcType=INTEGER},
772 787
       is_notice = #{isNotice,jdbcType=INTEGER},
773
-      pzmc = #{pzmc,jdbcType=VARCHAR}
788
+      pzmc = #{pzmc,jdbcType=VARCHAR},
789
+      is_sheet = #{isSheet,jdbcType=INTEGER}
774 790
     where id = #{id,jdbcType=INTEGER}
775 791
   </update>
776 792
   

+ 9 - 0
src/main/java/com/chinaitop/depot/business/model/BusinessNoticeReceive.java

@@ -21,9 +21,18 @@ public class BusinessNoticeReceive {
21 21
 	  private Integer auditState;
22 22
 	  private Integer isNotice;
23 23
 	  private String pzmc;
24
+	  private Integer isSheet;
24 25
 	  
25 26
 	
26 27
 	
28
+	public Integer getIsSheet() {
29
+		return isSheet;
30
+	}
31
+
32
+	public void setIsSheet(Integer isSheet) {
33
+		this.isSheet = isSheet;
34
+	}
35
+
27 36
 	public String getPzmc() {
28 37
 		return pzmc;
29 38
 	}

+ 5 - 0
src/main/java/com/chinaitop/depot/business/model/BusinessNoticeReceiveExample.java

@@ -227,6 +227,11 @@ public class BusinessNoticeReceiveExample {
227 227
             return (Criteria) this;
228 228
         }
229 229
         
230
+        public Criteria andIsSheetEqualTo(Integer value) {
231
+            addCriterion("is_sheet =", value, "isSheet");
232
+            return (Criteria) this;
233
+        }
234
+        
230 235
         
231 236
         public Criteria andIdIsNull() {
232 237
             addCriterion("id is null");

+ 5 - 0
src/main/java/com/chinaitop/depot/business/service/impl/ReceiveNoticeServiceImpl.java

@@ -116,6 +116,9 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
116 116
         if(businessNoticeReceive.getIsNotice()!=null){
117 117
         	createCriteria.andIsNoticeEqualTo(businessNoticeReceive.getIsNotice());
118 118
         }
119
+        if(businessNoticeReceive.getIsSheet()!=null){
120
+        	createCriteria.andIsSheetEqualTo(businessNoticeReceive.getIsSheet());
121
+        }
119 122
         if(pageNum!=null && pageSize!=null){
120 123
         	PageHelper.startPage(pageNum, pageSize);
121 124
         }
@@ -277,7 +280,9 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
277 280
                             businessNoticeReceive.setIsNotice(0);//0是可以引用的通知单
278 281
                             businessNoticeReceive.setAuditState(0);//下达未审批
279 282
                             businessNoticeReceive.setReceiveTime(new Date());//接收数据的时间
283
+                            businessNoticeReceive.setIsSheet(0);//是性质转变单
280 284
                             businessNoticeReceiveMapper.insert(businessNoticeReceive);
285
+                           
281 286
                         }
282 287
 
283 288