lxp 1 ano atrás
pai
commit
0d512630cd

+ 1 - 1
yinet-admin/src/main/resources/templates/rlzy/apply/edit.html

@@ -123,7 +123,7 @@
                     <div class="form-group">
                         <label class="col-sm-2 control-label">文件:</label>
                         <div class="col-sm-10">
-                            <img  style="width: 220px;height: 220px" th:src="*{file}" >
+                            <img  style="width: 300px;height: 200px" th:src="*{file}" >
                         </div>
                     </div>
                 </div>

+ 2 - 2
yinet-admin/src/main/resources/templates/rlzy/print/dylist.html

@@ -338,7 +338,7 @@
 								0,     //打印纸盒选择(0:使用默认纸盒,1:使用纸盒1,2:使用纸盒2,5:使用手动纸盒)
 								0,       //打印纸张选择(0:A4,1:A3,2:A5)
 								1,      //是否彩色打印(0:黑白打印,1:彩色打印)
-								1,  //是否横向打印(0:纵向,1:横向)
+								0,  //是否横向打印(0:纵向,1:横向)
 								0     //是否需要返回实际打印结果(0:不需要,1:需要
 						);
 
@@ -410,7 +410,7 @@
 								0,     //打印纸盒选择(0:使用默认纸盒,1:使用纸盒1,2:使用纸盒2,5:使用手动纸盒)
 								0,       //打印纸张选择(0:A4,1:A3,2:A5)
 								1,      //是否彩色打印(0:黑白打印,1:彩色打印)
-								1,  //是否横向打印(0:纵向,1:横向)
+								0,  //是否横向打印(0:纵向,1:横向)
 								0     //是否需要返回实际打印结果(0:不需要,1:需要
 						);
 					}else  {

+ 3 - 0
yinet-system/src/main/java/com/yinet/rlzy/domain/RlzyApply.java

@@ -147,6 +147,9 @@ public class RlzyApply extends BaseEntity {
     @Column(name = "efficacious_date")
     private Date efficaciousDate;
 
+    @Excel(name = "告知承诺书")
+    @Column(name = "chengnuoshu")
+    private String chengnuoshu;
 
     @Column(name = "create_by")
     private String createBy;

+ 5 - 0
yinet-system/src/main/resources/mapper/rlzy/RlzyApplyMapper.xml

@@ -26,6 +26,7 @@
         <result property="status" column="status"/>
         <result property="openingDate" column="opening_date"/>
         <result property="efficaciousDate" column="efficacious_date"/>
+        <result property="chengnuoshu" column="chengnuoshu"/>
         <result property="file" column="file"/>
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
@@ -53,6 +54,7 @@
                license_code,
                opening_date,
                efficacious_date,
+               chengnuoshu,
                status,
                create_by,
                create_time,
@@ -131,6 +133,9 @@
             <if test="efficaciousDate != null ">
                 and efficacious_date = #{efficaciousDate}
             </if>
+            <if test="chengnuoshu != null and chengnuoshu != ''">
+                and chengnuoshu = #{chengnuoshu}
+            </if>
             and  status = 1
         </where>
     </select>