ezhizao_zx 8 months ago
parent
commit
b752ac5fc6

+ 11 - 0
src/main/java/cn/ezhizao/project/business/carrier/controller/BizCarrierController.java

@@ -49,6 +49,7 @@ import java.io.File;
 import java.io.IOException;
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.MalformedURLException;
 import java.util.ArrayList;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
 
 
@@ -212,6 +213,16 @@ public class BizCarrierController extends BaseController {
         return toAjax(iBizCarrierService.removeBatchByIds(ids));
         return toAjax(iBizCarrierService.removeBatchByIds(ids));
     }
     }
 
 
+    @Log(title="载具码pdf", businessType = BusinessType.UPDATE)
+    @GetMapping("/printUpdate/{ids}")
+    public AjaxResult printUpdate(@PathVariable List<Long> ids) {
+        List<BizCarrier> carriers = iBizCarrierService.query().in("id", ids.isEmpty() ? Collections.singletonList(-1) : ids).list();
+        carriers.forEach(l -> {
+            l.setIsPrint(1);
+        });
+        return toAjax(carriers.isEmpty() || iBizCarrierService.updateBatchById(carriers));
+    }
+
     /**
     /**
      * 取消废弃
      * 取消废弃
      *
      *

+ 3 - 0
src/main/java/cn/ezhizao/project/business/carrier/domain/BizCarrier.java

@@ -98,4 +98,7 @@ public class BizCarrier extends BaseEntity {
 
 
     // 是否检查载具
     // 是否检查载具
     private Integer isInspection;
     private Integer isInspection;
+
+    // 是否已打印
+    private Integer isPrint;
 }
 }

+ 2 - 1
src/main/resources/mybatis/business/carrier/BizCarrierMapper.xml

@@ -10,13 +10,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <select id="getList" resultMap="BizCarrierResult" parameterType="cn.ezhizao.project.business.carrier.domain.BizCarrier">
     <select id="getList" resultMap="BizCarrierResult" parameterType="cn.ezhizao.project.business.carrier.domain.BizCarrier">
         select t1.id,t1.category_id,t1.code,t1.qc_code,t1.remark,t1.tenant_id,t1.is_allow_more,t1.create_time,
         select t1.id,t1.category_id,t1.code,t1.qc_code,t1.remark,t1.tenant_id,t1.is_allow_more,t1.create_time,
-               COALESCE((SELECT t2.is_abandoned FROM biz_carrier_reject t2 WHERE t1.id = t2.carrier_id ORDER BY t2.create_time DESC LIMIT 1), 0) AS is_abandoned
+               COALESCE((SELECT t2.is_abandoned FROM biz_carrier_reject t2 WHERE t1.id = t2.carrier_id ORDER BY t2.create_time DESC LIMIT 1), 0) AS is_abandoned, t1.is_print
         FROM biz_carrier t1
         FROM biz_carrier t1
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
             deleted = 0
             deleted = 0
             <if test="categoryId != null  and categoryId != 0"> AND category_id = #{categoryId}</if>
             <if test="categoryId != null  and categoryId != 0"> AND category_id = #{categoryId}</if>
             <if test="tenantId != null  and tenantId != 0"> AND tenant_id = #{tenantId}</if>
             <if test="tenantId != null  and tenantId != 0"> AND tenant_id = #{tenantId}</if>
             <if test="code != null  and code != ''"> AND code LIKE CONCAT('%', #{code}, '%')</if>
             <if test="code != null  and code != ''"> AND code LIKE CONCAT('%', #{code}, '%')</if>
+            <if test="isPrint != null"> AND is_print = #{isPrint}</if>
 
 
         </trim>
         </trim>