word补全页眉

cement-business/src/main/java/cn/wise/sc/cement/business/controller/PlanEquipmentPurchaseController.java

@@ -59,6 +59,14 @@ public class PlanEquipmentPurchaseController {
 		}
 	}
 
+
+	@ApiOperation("设备采购计划列表导出(word)")
+	@PostMapping("/export/word")
+	public void exportWord(HttpServletResponse response){
+		equipmentPurchaseService.exportWord(response);
+	}
+
+
 	@ApiOperation(value = "新增设备采购计划")
 	@PostMapping("/create")
 	public BaseResponse create(@RequestBody PlanEquipmentPurchaseQuery query) {

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/PlanConsumablesPurchaseMapper.java

@@ -27,4 +27,5 @@ public interface PlanConsumablesPurchaseMapper extends BaseMapper<PlanConsumable
 
 	PlanConsumablesPurchaseVo getDetail(Integer id);
 
+	List<PlanConsumablesPurchaseVo> exportWordList(@Param("params") Map<String, Object> params);
 }

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/PlanEquipmentPurchaseMapper.java

@@ -27,4 +27,8 @@ public interface PlanEquipmentPurchaseMapper extends BaseMapper<PlanEquipmentPur
 
 	PlanEquipmentPurchaseVo getDetail(Integer id);
 
+	/**
+	 * @return
+	 */
+	List<PlanEquipmentPurchaseVo> exportWordList(@Param("params") Map<String, Object> params);
 }

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/SampleMapper.java

@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -24,41 +25,41 @@ import java.util.Map;
  */
 public interface SampleMapper extends BaseMapper<Sample> {
 
-	IPage<SampleVo> getPage(@Param("page") Page page, @Param("params") Map<String, Object> params);
+    IPage<SampleVo> getPage(@Param("page") Page page, @Param("params") Map<String, Object> params);
 
-	List<Map<String, Object>> exportList(@Param("params") Map<String, Object> params);
+    List<Map<String, Object>> exportList(@Param("params") Map<String, Object> params);
 
-	SampleVo getDetail(Integer id);
+    SampleVo getDetail(Integer id);
 
-	@Select("select max(parallel_code) from sample")
-	String getMaxCementCode();
+    @Select("select max(parallel_code) from sample")
+    String getMaxCementCode();
 
-	@Select("select * from sample where cement_code = parallel_code and entrust_id = #{entrustId}" +
-			" order by id asc ")
-	List<Sample> getSampleList(Integer entrustId);
+    @Select("select * from sample where cement_code = parallel_code and entrust_id = #{entrustId}" +
+            " order by id asc ")
+    List<Sample> getSampleList(Integer entrustId);
 
-	@Select("select * from sample where cement_code = parallel_code and entrust_id = #{entrustId} " +
-			" and is_handle != 1 order by id asc")
-	List<Sample> getNoHandleList(Integer entrustId);
+    @Select("select * from sample where cement_code = parallel_code and entrust_id = #{entrustId} " +
+            " and is_handle != 1 order by id asc")
+    List<Sample> getNoHandleList(Integer entrustId);
 
-	@Select("select * from sample where entrust_id = #{entrustId}  and is_distribution != 1 order by id asc")
-	List<Sample> getNoDistributionList(Integer entrustId);
+    @Select("select * from sample where entrust_id = #{entrustId}  and is_distribution != 1 order by id asc")
+    List<Sample> getNoDistributionList(Integer entrustId);
 
-	//校核详情样品列表（不展示平行样副样）
-	@Select("select * from sample where cement_code = parallel_code and entrust_id = #{entrustId} " +
-			"and is_handle = 1 and is_distribution = 1 order by id asc")
-	List<Sample> getCheckSampleList(Integer entrustId);
+    //校核详情样品列表（不展示平行样副样）
+    @Select("select * from sample where cement_code = parallel_code and entrust_id = #{entrustId} " +
+            "and is_handle = 1 and is_distribution = 1 order by id asc")
+    List<Sample> getCheckSampleList(Integer entrustId);
 
-	@Select("select * from sample where entrust_id = #{entrustId}  and is_check != 1 order by id asc")
-	List<Sample> getNoCheckList(Integer entrustId);
+    @Select("select * from sample where entrust_id = #{entrustId}  and is_check != 1 order by id asc")
+    List<Sample> getNoCheckList(Integer entrustId);
 
-	@Select("select * from sample where entrust_id = #{entrustId}  and  cement_code= #{cementCode}")
-	List<Sample> getByCementCode(@Param("entrustId") Integer entrustId, @Param("cementCode") String cementCode);
+    @Select("select * from sample where entrust_id = #{entrustId}  and  cement_code= #{cementCode}")
+    List<Sample> getByCementCode(@Param("entrustId") Integer entrustId, @Param("cementCode") String cementCode);
 
-	@Select("select * from sample where entrust_id = #{entrustId} order by id asc")
-	List<Sample> getSampleCheckList(Integer entrustId);
+    @Select("select * from sample where entrust_id = #{entrustId} order by id asc")
+    List<Sample> getSampleCheckList(Integer entrustId);
 
     List<SampleSaveDto> getSampleSaveList();
 
-	List<SampleWord> exportWordList();
+    List<SampleWord> exportWordList(@Param("start") Date start, @Param("end") Date end);
 }

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/PlanConsumablesPurchaseMapper.xml

@@ -12,6 +12,23 @@
             </if>
         </where>
     </sql>
+    <sql id="whereNew">
+        <where>
+            <if test="params.status != null">
+                and t.status = #{params.status}
+            </if>
+            <if test="params.name != null and params.name != ''">
+                and t.name like concat('%', #{params.name}, '%')
+            </if>
+            <if test="params.start !=null">
+                and t.create_time <![CDATA[>=]]> #{params.start}
+            </if>
+            <if test="params.end !=null">
+                and t.create_time <![CDATA[<=]]> #{params.end}
+            </if>
+        </where>
+    </sql>
+
 
     <select id="getPage" resultType="cn.wise.sc.cement.business.model.vo.PlanConsumablesPurchaseVo">
         SELECT t.*, su.name as purchaserName
@@ -48,4 +65,12 @@
         WHERE t.id = #{id}
     </select>
 
+    <select id="exportWordList" resultType="cn.wise.sc.cement.business.model.vo.PlanConsumablesPurchaseVo">
+        SELECT t.*, su.name as purchaserName
+        FROM plan_consumables_purchase t
+        left join sys_user su on su.id = t.purchaser_id
+        <include refid="whereNew"/>
+        ORDER BY t.id DESC
+    </select>
+
 </mapper>

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/PlanEquipmentPurchaseMapper.xml

@@ -13,6 +13,23 @@
         </where>
     </sql>
 
+    <sql id="whereNew">
+        <where>
+            <if test="params.status != null">
+                and t.status = #{params.status}
+            </if>
+            <if test="params.name != null and params.name != ''">
+                and t.name like concat('%', #{params.name}, '%')
+            </if>
+            <if test="params.start !=null">
+                and t.create_time <![CDATA[>=]]> #{params.start}
+            </if>
+            <if test="params.end !=null">
+                and t.create_time <![CDATA[<=]]> #{params.end}
+            </if>
+        </where>
+    </sql>
+
     <select id="getPage" resultType="cn.wise.sc.cement.business.model.vo.PlanEquipmentPurchaseVo">
         SELECT t.*, su.name as purchaserName
         FROM plan_equipment_purchase t
@@ -48,5 +65,13 @@
         WHERE t.id = #{id}
     </select>
 
+    <select id="exportWordList" resultType="cn.wise.sc.cement.business.model.vo.PlanEquipmentPurchaseVo">
+        SELECT t.*, su.name as purchaserName
+        FROM plan_equipment_purchase t
+        left join sys_user su on su.id = t.purchaser_id
+        <include refid="whereNew"/>
+        ORDER BY t.id DESC
+    </select>
+
 
 </mapper>

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/SampleMapper.xml

@@ -101,6 +101,8 @@
             `sample` s
             LEFT JOIN entrust e ON s.entrust_id = e.id
             LEFT JOIN sys_user su ON su.id = s.operator_id
+            where s.create_time <![CDATA[>=]]> #{start}
+            and s.create_time <![CDATA[<=]]> #{end}
     </select>
 
 

cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/PlanConsumablesPurchaseVo.java

@@ -63,4 +63,6 @@ public class PlanConsumablesPurchaseVo {
 	@ApiModelProperty("备注")
 	private String remark;
 
+	private String createTimeStr;
+
 }

cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/PlanEquipmentPurchaseVo.java

@@ -63,4 +63,6 @@ public class PlanEquipmentPurchaseVo {
 	@ApiModelProperty("备注")
 	private String remark;
 
+	private String createTimeStr;
+
 }

cement-business/src/main/java/cn/wise/sc/cement/business/service/IPlanEquipmentPurchaseService.java

@@ -35,4 +35,5 @@ public interface IPlanEquipmentPurchaseService extends IService<PlanEquipmentPur
 
 	BaseResponse<String> delete(Integer id);
 
+	void exportWord(HttpServletResponse response);
 }

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/PlanConsumablesPurchaseServiceImpl.java

@@ -236,8 +236,9 @@ public class PlanConsumablesPurchaseServiceImpl extends ServiceImpl<PlanConsumab
         Map<String, Object> beanParams = new HashMap<>();
         records.add(records.get(0));
         beanParams.put("list", records);
+        beanParams.put("fileNo","");
         beanParams.put("year", DateUtil.year(DateUtil.date()) +"");
-        WordUtil.writeWordReport("消耗品采购计划.docx", "消耗品采购计划 .ftl", beanParams, response, FileExt.DOC);
+        WordUtil.writeWordReport("消耗品采购计划.docx", "消耗品采购计划.ftl", beanParams, response, FileExt.DOC);
     }
 
 }

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/SampleServiceImpl.java

 package cn.wise.sc.cement.business.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.wise.sc.cement.business.entity.Sample;
 import cn.wise.sc.cement.business.enumation.FileExt;
@@ -28,6 +29,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -277,7 +279,10 @@ public class SampleServiceImpl extends ServiceImpl<SampleMapper, Sample> impleme
     @Override
     public void exportWord(HttpServletResponse response) {
 
-        List<SampleWord> list = sampleMapper.exportWordList();
+        Date start = DateUtil.beginOfYear(DateUtil.date());
+        Date end = DateUtil.endOfYear(DateUtil.date());
+
+        List<SampleWord> list = sampleMapper.exportWordList(start, end);
 
         if (CollectionUtil.isEmpty(list)) {
             log.debug("没找到数据!");
@@ -285,6 +290,7 @@ public class SampleServiceImpl extends ServiceImpl<SampleMapper, Sample> impleme
 
         Map<String, Object> params = new HashMap<>(1);
         params.put("list", list);
+        params.put("fileNo","");
 
         WordUtil.writeWordReport("原料存放、销毁记录", "原料存放、销毁记录.ftl", params, response, FileExt.DOC);