Merge branch 'dev' of http://git.ycjcjy.com/state_grid/invoice_fill_service into dev

deploy/.s/1636896505560465-cn-shanghai-stategrid-service-invoice-filling-httpTrigger.json

       "disableURLInternet": false
     },
     "createdTime": "2022-07-18T02:02:16Z",
-    "lastModifiedTime": "2023-09-11T09:38:02Z",
+    "lastModifiedTime": "2023-09-12T02:45:10Z",
     "status": null,
     "targetArn": null,
     "name": "httpTrigger"

deploy/.s/1636896505560465-cn-shanghai-stategrid-service-invoice-filling.json

     "timeout": 30,
     "initializer": "",
     "initializationTimeout": 3,
-    "codeSize": 69229221,
-    "codeChecksum": "3053493131185536708",
+    "codeSize": 69225347,
+    "codeChecksum": "6954604591044511436",
     "memorySize": 1024,
     "gpuMemorySize": null,
     "environmentVariables": {},
     "createdTime": "2022-07-18T02:02:16Z",
-    "lastModifiedTime": "2023-09-11T09:37:59Z",
+    "lastModifiedTime": "2023-09-12T02:45:06Z",
     "instanceConcurrency": 1,
     "instanceSoftConcurrency": null,
     "customContainerConfig": null,

deploy/.s/1636896505560465-cn-shanghai-stategrid-service.json

     },
     "serviceId": "6e96fa7b-9988-4908-b06a-0aa7e510c881",
     "createdTime": "2022-02-26T04:50:56Z",
-    "lastModifiedTime": "2023-09-11T09:38:02Z",
+    "lastModifiedTime": "2023-09-12T02:45:10Z",
     "vpcConfig": {
       "vpcId": "",
       "vSwitchIds": [],

deploy/.s/invoice-filling.stategrid.njyunzhi.com.json

     ]
   },
   "createdTime": "2022-07-18T02:03:47Z",
-  "lastModifiedTime": "2023-09-11T09:38:03Z",
+  "lastModifiedTime": "2023-09-12T02:45:10Z",
   "keepFullPath": null,
   "subdomainCount": null,
   "wafConfig": null

deploy/s.prod.yaml

       function:
         name: invoice-filling
         description: '发票确认'
-        codeUri: ../target/invoice-0.0.7.jar
+        codeUri: ../target/invoice-0.0.8.jar
         runtime: custom
         memorySize: 1024
         timeout: 30

src/main/java/com/njyunzhi/invoice/controller/TaInvoiceFillController.java

 
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.ExcelWriter;
-import com.alibaba.excel.metadata.Head;
-import com.alibaba.excel.support.ExcelTypeEnum;
-import com.alibaba.excel.write.merge.AbstractMergeStrategy;
 import com.alibaba.excel.write.metadata.WriteSheet;
 import com.alibaba.excel.write.metadata.fill.FillConfig;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.njyunzhi.invoice.common.*;
 import com.njyunzhi.invoice.common.excel.MergeRowStrategy;
 import com.njyunzhi.invoice.entity.TaInvoiceDetail;
+import com.njyunzhi.invoice.entity.TaInvoiceFill;
 import com.njyunzhi.invoice.service.ITaInvoiceDetailService;
+import com.njyunzhi.invoice.service.ITaInvoiceFillService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.Sheet;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import com.njyunzhi.invoice.service.ITaInvoiceFillService;
-import com.njyunzhi.invoice.entity.TaInvoiceFill;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
-import java.io.File;
 import java.io.InputStream;
 import java.util.HashMap;
 import java.util.List;
 
 /**
  * <p>
-    * 报销主表 前端控制器
-    * </p>
+ * 报销主表 前端控制器
+ * </p>
  *
  * @author yansen
  * @since 2022-07-04
 
     /**
      * 分页查询列表
+     *
      * @param pageNum
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/{client}/invoice",method= RequestMethod.GET)
-    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
+    @RequestMapping(value = "/{client}/invoice", method = RequestMethod.GET)
+    @ApiOperation(value = "列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean taInvoiceFillList(@ApiParam("客户端") @PathVariable String client,
-                                          @ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                          @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                          @ApiParam("班级名称") @RequestParam(value ="name", required = false) String name) throws Exception{
+                                          @ApiParam("页码") @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                          @ApiParam("单页数据量") @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                          @ApiParam("班级名称") @RequestParam(value = "name", required = false) String name,
+                                          @ApiParam("状态") @RequestParam(value = "status", required = false) String status) throws Exception {
         IPage<TaInvoiceFill> pg = new Page<>(pageNum, pageSize);
         QueryWrapper<TaInvoiceFill> queryWrapper = new QueryWrapper<>();
         queryWrapper.gt("status", Constants.STATUS_DELETE);
+        queryWrapper.eq(!StringUtils.isEmpty(status),"status", status);
         queryWrapper.like(!StringUtils.isEmpty(name), "name", "%" + name + "%");
         queryWrapper.orderByAsc("create_date");
 
         return ResponseBean.success(result);
     }
 
-    @RequestMapping(value="/admin/invoice/{id}/export",method= RequestMethod.POST)
-    @ApiOperation(value="导出", notes = "导出", httpMethod = "POST", response = ResponseBean.class)
+    @RequestMapping(value = "/admin/invoice/{id}/export", method = RequestMethod.POST)
+    @ApiOperation(value = "导出", notes = "导出", httpMethod = "POST", response = ResponseBean.class)
     public void export(@ApiParam("班级ID") @PathVariable String id,
-                               HttpServletResponse response) throws Exception {
+                       HttpServletResponse response) throws Exception {
         TaInvoiceFill invoiceFill = iTaInvoiceFillService.getById(id);
         if (null == invoiceFill) {
             throw new Exception("为找到班级信息");
 
         response.setContentType("application/vnd.ms-excel");
         response.setCharacterEncoding("utf-8");
-        response.setHeader("Content-disposition", "attachment;filename="+expFile);
+        response.setHeader("Content-disposition", "attachment;filename=" + expFile);
 
         List<Object> mergeDataList = list.stream().map(x -> x.getPersonName()).collect(Collectors.toList());
         ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), TaInvoiceDetail.class).withTemplate(inputStream).build();
 
     /**
      * 保存对象
+     *
      * @param taInvoiceFill 实体对象
      * @return
      */
-    @RequestMapping(value="/admin/invoice",method= RequestMethod.POST)
-    @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
-    public ResponseBean taInvoiceFillAdd(@ApiParam("保存内容") @RequestBody TaInvoiceFill taInvoiceFill) throws Exception{
+    @RequestMapping(value = "/admin/invoice", method = RequestMethod.POST)
+    @ApiOperation(value = "保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
+    public ResponseBean taInvoiceFillAdd(@ApiParam("保存内容") @RequestBody TaInvoiceFill taInvoiceFill) throws Exception {
 
         if (null == taInvoiceFill.getStatus()) {
             taInvoiceFill.setStatus(Constants.STATUS_READY);
         }
 
-        if (iTaInvoiceFillService.save(taInvoiceFill)){
+        if (iTaInvoiceFillService.save(taInvoiceFill)) {
             return ResponseBean.success(taInvoiceFill);
-        }else {
+        } else {
             return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
         }
     }
 
     /**
      * 根据id删除对象
-     * @param id  实体ID
+     *
+     * @param id 实体ID
      */
-    @RequestMapping(value="/admin/invoice/{id}", method= RequestMethod.DELETE)
-    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
-    public ResponseBean taInvoiceFillDelete(@ApiParam("对象ID") @PathVariable String id) throws Exception{
-        if(iTaInvoiceFillService.removeLogicById(id)){
+    @RequestMapping(value = "/admin/invoice/{id}", method = RequestMethod.DELETE)
+    @ApiOperation(value = "删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
+    public ResponseBean taInvoiceFillDelete(@ApiParam("对象ID") @PathVariable String id) throws Exception {
+        if (iTaInvoiceFillService.removeLogicById(id)) {
             return ResponseBean.success("success");
-        }else {
+        } else {
             return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
         }
     }
 
     /**
      * 修改对象
-     * @param id  实体ID
+     *
+     * @param id            实体ID
      * @param taInvoiceFill 实体对象
      * @return
      */
-    @RequestMapping(value="/admin/invoice/{id}",method= RequestMethod.PUT)
-    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
+    @RequestMapping(value = "/admin/invoice/{id}", method = RequestMethod.PUT)
+    @ApiOperation(value = "更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
     public ResponseBean taInvoiceFillUpdate(@ApiParam("对象ID") @PathVariable String id,
-                                        @ApiParam("更新内容") @RequestBody TaInvoiceFill taInvoiceFill) throws Exception{
+                                            @ApiParam("更新内容") @RequestBody TaInvoiceFill taInvoiceFill) throws Exception {
 
         taInvoiceFill.setInvoiceId(id);
-        if (iTaInvoiceFillService.updateById(taInvoiceFill)){
+        if (iTaInvoiceFillService.updateById(taInvoiceFill)) {
             return ResponseBean.success(iTaInvoiceFillService.getById(id));
-        }else {
+        } else {
             return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
         }
     }
 
     /**
      * 根据id查询对象
-     * @param id  实体ID
+     *
+     * @param id 实体ID
      */
-    @RequestMapping(value="/admin/invoice/{id}",method= RequestMethod.GET)
-    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taInvoiceFillGet(@ApiParam("对象ID") @PathVariable String id) throws Exception{
+    @RequestMapping(value = "/admin/invoice/{id}", method = RequestMethod.GET)
+    @ApiOperation(value = "详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean taInvoiceFillGet(@ApiParam("对象ID") @PathVariable String id) throws Exception {
         return ResponseBean.success(iTaInvoiceFillService.getById(id));
     }
 
 
-    @RequestMapping(value="/h5/invoice/{invoiceId}",method= RequestMethod.GET)
-    @ApiOperation(value="获取报销单", notes = "获取报销单", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean getInvoice(@ApiParam("班级ID") @PathVariable(value ="invoiceId") String invoiceId) throws Exception{
+    @RequestMapping(value = "/h5/invoice/{invoiceId}", method = RequestMethod.GET)
+    @ApiOperation(value = "获取报销单", notes = "获取报销单", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean getInvoice(@ApiParam("班级ID") @PathVariable(value = "invoiceId") String invoiceId) throws Exception {
         TaInvoiceFill taInvoiceFill = iTaInvoiceFillService.getById(invoiceId);
         if (null == taInvoiceFill || taInvoiceFill.getStatus() != Constants.STATUS_NORMAL) {
             return ResponseBean.error("报销单不存在");

src/main/java/com/njyunzhi/invoice/entity/TaInvoiceDetail.java

 import java.io.Serializable;
 import java.util.List;
 
+import com.njyunzhi.invoice.common.excel.IsNeedLodqingCoverter;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
     @ApiModelProperty(value = "住宿清单")
     private String stayRemark;
 
+        @ExcelProperty(index = 12, converter = IsNeedLodqingCoverter.class)
+    @ApiModelProperty(value = "0不需要 1需要 是否需要住宿清单")
+    private String isNeedLodging;
+
+    @ExcelProperty(index = 13)
+    @ApiModelProperty(value = "房号")
+    private String roomCode;
+
     @ApiModelProperty(value = "收件人姓名")
     private String mailUser;
 

src/main/resources/application-dev.yml

   datasource:
     url: jdbc:mysql://112.2.2.154:3394/invoice_fill?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
     username: invoice_fill
-    password: invoice_fill@ABCD1234
+    password: invoice_fill
 
 wx:
   mp:

src/main/resources/mapper/TaInvoiceDetailMapper.xml

             t.`mail_phone`,
             t.`mail_address`,
             t.`status`,
-            t.`create_date`
+            t.`create_date`,
+            t.`is_need_lodging`,
+            t.`room_code`
         FROM
             ta_invoice_detail t
                 INNER JOIN ta_invoice_item s ON t.invoice_id = s.invoice_id AND t.invoice_person_id = s.invoice_person_id