feats

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

@@ -21,7 +21,9 @@
       "authType": "anonymous"
     },
     "createdTime": "2022-07-18T02:02:16Z",
-    "lastModifiedTime": "2022-07-19T07:13:25Z",
+    "lastModifiedTime": "2022-11-15T06:43:32Z",
+    "status": null,
+    "targetArn": null,
     "name": "httpTrigger"
   }
 }

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

@@ -8,19 +8,20 @@
     "timeout": 30,
     "initializer": "",
     "initializationTimeout": 3,
-    "codeSize": 69220537,
-    "codeChecksum": "5731091282673601247",
+    "codeSize": 69222278,
+    "codeChecksum": "17422496305130090700",
     "memorySize": 1024,
     "gpuMemorySize": null,
     "environmentVariables": {},
     "createdTime": "2022-07-18T02:02:16Z",
-    "lastModifiedTime": "2022-07-19T07:13:16Z",
+    "lastModifiedTime": "2022-11-15T06:43:21Z",
     "instanceConcurrency": 1,
     "instanceSoftConcurrency": null,
     "customContainerConfig": null,
     "caPort": 9000,
     "instanceType": "e1",
     "layers": null,
+    "layersArnV2": null,
     "instanceLifecycleConfig": {
       "preFreeze": {
         "handler": "",
@@ -40,6 +41,7 @@
         "org.springframework.boot.loader.JarLauncher"
       ]
     },
+    "customHealthCheckConfig": null,
     "name": "invoice-filling"
   }
 }

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

@@ -12,7 +12,7 @@
     },
     "serviceId": "6e96fa7b-9988-4908-b06a-0aa7e510c881",
     "createdTime": "2022-02-26T04:50:56Z",
-    "lastModifiedTime": "2022-07-19T07:13:25Z",
+    "lastModifiedTime": "2022-11-15T06:43:32Z",
     "vpcConfig": {
       "vpcId": "",
       "vSwitchIds": [],
@@ -26,6 +26,9 @@
       "groupId": -1,
       "mountPoints": []
     },
+    "ossMountConfig": {
+      "mountPoints": []
+    },
     "vendorConfig": null,
     "tracingConfig": {
       "type": null,

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

@@ -33,5 +33,5 @@
     ]
   },
   "createdTime": "2022-07-18T02:03:47Z",
-  "lastModifiedTime": "2022-07-19T07:13:25Z"
+  "lastModifiedTime": "2022-11-15T06:43:32Z"
 }

deploy/s.prod.yaml

@@ -49,7 +49,7 @@ services:
       function:
         name: invoice-filling
         description: '发票确认'
-        codeUri: ../target/invoice-0.0.3.jar
+        codeUri: ../target/invoice-0.0.5.jar
         runtime: custom
         memorySize: 1024
         timeout: 30

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.njyunzhi</groupId>
 	<artifactId>invoice</artifactId>
-	<version>0.0.3</version>
+	<version>0.0.5</version>
 	<name>invoice-fill</name>
 	<description>发票填报</description>
 	<properties>

src/main/java/com/njyunzhi/invoice/config/JacksonConfig.java

@@ -0,0 +1,70 @@
+package com.njyunzhi.invoice.config;
+
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalTimeSerializer;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
+
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
+import java.util.TimeZone;
+
+/**
+ * 处理 RequestBody 中的日期
+ */
+
+@Configuration
+public class JacksonConfig {
+
+    /** 默认日期时间格式 */
+    public static final String DEFAULT_DATE_TIME_FORMAT = "yyyy-MM-dd HH:mm:ss";
+    /** 默认日期格式 */
+    public static final String DEFAULT_DATE_FORMAT = "yyyy-MM-dd";
+    /** 默认时间格式 */
+    public static final String DEFAULT_TIME_FORMAT = "HH:mm:ss";
+
+    @Bean
+    public MappingJackson2HttpMessageConverter mappingJackson2HttpMessageConverter() {
+        MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter();
+        ObjectMapper objectMapper = new ObjectMapper();
+
+        // 忽略json字符串中不识别的属性
+        objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+        // 忽略无法转换的对象
+        objectMapper.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false);
+        // PrettyPrinter 格式化输出
+        objectMapper.configure(SerializationFeature.INDENT_OUTPUT, true);
+        // NULL不参与序列化
+//        objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
+
+        // 指定时区
+        objectMapper.setTimeZone(TimeZone.getTimeZone("GMT+8:00"));
+        // 日期类型字符串处理
+        objectMapper.setDateFormat(new SimpleDateFormat(DEFAULT_DATE_TIME_FORMAT));
+
+        // java8日期日期处理
+        JavaTimeModule javaTimeModule = new JavaTimeModule();
+        javaTimeModule.addSerializer(LocalDateTime.class, new LocalDateTimeSerializer(DateTimeFormatter.ofPattern(DEFAULT_DATE_TIME_FORMAT)));
+        javaTimeModule.addSerializer(LocalDate.class, new LocalDateSerializer(DateTimeFormatter.ofPattern(DEFAULT_DATE_FORMAT)));
+        javaTimeModule.addSerializer(LocalTime.class, new LocalTimeSerializer(DateTimeFormatter.ofPattern(DEFAULT_TIME_FORMAT)));
+        javaTimeModule.addDeserializer(LocalDateTime.class, new LocalDateTimeDeserializer(DateTimeFormatter.ofPattern(DEFAULT_DATE_TIME_FORMAT)));
+        javaTimeModule.addDeserializer(LocalDate.class, new LocalDateDeserializer(DateTimeFormatter.ofPattern(DEFAULT_DATE_FORMAT)));
+        javaTimeModule.addDeserializer(LocalTime.class, new LocalTimeDeserializer(DateTimeFormatter.ofPattern(DEFAULT_TIME_FORMAT)));
+        objectMapper.registerModule(javaTimeModule);
+
+        converter.setObjectMapper(objectMapper);
+        return converter;
+    }
+}

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

@@ -88,6 +88,31 @@ public class TaInvoiceDetailController extends BaseController {
         return ResponseBean.success(result);
     }
 
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/invoice/{invoiceId}/detail/history",method= RequestMethod.GET)
+    @ApiOperation(value="报销列表", notes = "报销列表", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean getHistory(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                @ApiParam("班级ID") @PathVariable(value ="invoiceId") String invoiceId,
+                                @ApiParam("人员ID") @PathVariable(value ="personId") String personId) throws Exception{
+
+        IPage<TaInvoiceDetail> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<TaInvoiceDetail> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("invoice_id", invoiceId);
+        queryWrapper.eq("person_id", personId);
+        queryWrapper.gt("status", Constants.STATUS_DELETE);
+        queryWrapper.orderByDesc("create_date");
+
+        IPage<TaInvoiceDetail> result = iTaInvoiceDetailService.page(pg, queryWrapper);
+        return ResponseBean.success(result);
+    }
+
     @RequestMapping(value="/admin/invoice/{invoiceId}/detail-tpl",method= RequestMethod.POST)
     @ApiOperation(value="一键生成", notes = "一键生成", httpMethod = "POST", response = ResponseBean.class)
     public ResponseBean taInvoiceDetailAdd(@ApiParam("班级ID") @PathVariable(value ="invoiceId") String invoiceId) throws Exception{
@@ -157,6 +182,7 @@ public class TaInvoiceDetailController extends BaseController {
         TaPerson taPerson = currentPerson();
         taInvoiceDetail.setPersonId(taPerson.getPersonId());
         taInvoiceDetail.setInvoiceId(invoiceId);
+
         if (iTaInvoiceDetailService.createOrMergeInvoiceDetail(taInvoiceDetail)){
             return ResponseBean.success(taInvoiceDetail);
         } else {
@@ -174,7 +200,7 @@ public class TaInvoiceDetailController extends BaseController {
     public ResponseBean getDetailByPerson(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                           @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                           @ApiParam("班级ID") @PathVariable(value ="invoiceId", required = false) String invoiceId,
-                                          @ApiParam("人员ID") @PathVariable(value ="personId", required = false) String personId,
+                                          @ApiParam("人员ID") @RequestParam(value ="personId", required = false) String personId,
                                           @ApiParam("人员名称") @RequestParam(value ="personName", required = false) String personName) throws Exception {
 
         if (StringUtils.isEmpty(invoiceId) && StringUtils.isEmpty(personId)) {

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

@@ -34,7 +34,9 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.InputStream;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -78,7 +80,7 @@ public class TaInvoiceFillController extends BaseController {
         QueryWrapper<TaInvoiceFill> queryWrapper = new QueryWrapper<>();
         queryWrapper.gt("status", Constants.STATUS_DELETE);
         queryWrapper.like(!StringUtils.isEmpty(name), "name", "%" + name + "%");
-        queryWrapper.orderByDesc("create_date");
+        queryWrapper.orderByAsc("create_date");
 
         // H5 端只能查看自己的报销单
         if ("h5".equals(client)) {
@@ -108,18 +110,17 @@ public class TaInvoiceFillController extends BaseController {
         response.setContentType("application/vnd.ms-excel");
         response.setCharacterEncoding("utf-8");
         response.setHeader("Content-disposition", "attachment;filename="+expFile);
-//        EasyExcel.write(response.getOutputStream(), TaInvoiceDetail.class)
-//                .withTemplate(inputStream)
-//                .excelType(ExcelTypeEnum.XLSX)
-//                .sheet()
-//                .doFill(list);
 
         List<Object> mergeDataList = list.stream().map(x -> x.getPersonName()).collect(Collectors.toList());
         ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), TaInvoiceDetail.class).withTemplate(inputStream).build();
         WriteSheet writeSheet = EasyExcel.writerSheet().registerWriteHandler(new MergeRowStrategy(mergeDataList, 2, 0)).build();
         FillConfig fillConfig = FillConfig.builder().forceNewRow(true).build();
 
+        Map<String, Object> map = new HashMap<>();
+        map.put("title", invoiceFill.getName());
+
         excelWriter.fill(list, fillConfig, writeSheet);
+        excelWriter.fill(map, writeSheet);
         excelWriter.finish();
     }
 

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

@@ -75,6 +75,22 @@ public class TaInvoicePersonController extends BaseController {
         return ResponseBean.success(result);
     }
 
+    /**
+     * 未填写列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/invoice/{invoiceId}/person/nofill",method= RequestMethod.GET)
+    @ApiOperation(value="未填写列表", notes = "未填写列表", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean noFillList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                            @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                            @ApiParam("班级ID") @PathVariable(value ="invoiceId") String invoiceId) throws Exception {
+        IPage<TaInvoicePerson> pg = new Page<>(pageNum, pageSize);
+        IPage<TaInvoicePerson> result = iTaInvoicePersonService.getNoFillList(pg, invoiceId);
+        return ResponseBean.success(result);
+    }
+
     /**
      * 保存对象
      * @param taInvoicePerson 实体对象

src/main/java/com/njyunzhi/invoice/mapper/TaInvoicePersonMapper.java

@@ -1,5 +1,6 @@
 package com.njyunzhi.invoice.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.njyunzhi.invoice.entity.TaInvoicePerson;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
@@ -19,4 +20,6 @@ import java.util.List;
 public interface TaInvoicePersonMapper extends BaseMapper<TaInvoicePerson> {
 
     List<TaInvoicePerson> getByName(@Param("invoiceId") String invoiceId, @Param("invoiceOrgId") String invoiceOrgId, @Param("name") String name);
+
+    IPage<TaInvoicePerson> getNoFillList(IPage<TaInvoicePerson> pg, @Param("invoiceId") String invoiceId);
 }

src/main/java/com/njyunzhi/invoice/service/ITaInvoicePersonService.java

@@ -1,5 +1,6 @@
 package com.njyunzhi.invoice.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.njyunzhi.invoice.entity.TaInvoicePerson;
 import com.njyunzhi.invoice.entity.TaPerson;
 import org.springframework.web.multipart.MultipartFile;
@@ -25,4 +26,6 @@ public interface ITaInvoicePersonService extends IBaseService<TaInvoicePerson> {
     TaInvoicePerson getByPerson(String invoiceId, String invoicePerson) throws Exception;
 
     boolean bind(TaInvoicePerson taInvoicePerson, TaPerson taPerson) throws Exception;
+
+    IPage<TaInvoicePerson> getNoFillList(IPage<TaInvoicePerson> pg, String invoiceId);
 }

src/main/java/com/njyunzhi/invoice/service/impl/TaInvoiceDetailServiceImpl.java

@@ -89,29 +89,33 @@ public class TaInvoiceDetailServiceImpl extends ServiceImpl<TaInvoiceDetailMappe
 
         // 如果不是新生成, 二次编辑
         if (null != origin) {
-            origin.setInvoicePersonId(taInvoiceDetail.getInvoicePersonId());
-            origin.setPersonName(taInvoiceDetail.getPersonName());
-            origin.setInvoiceOrgId(taInvoiceDetail.getInvoiceOrgId());
-            origin.setInvoiceOrgName(taInvoiceDetail.getInvoiceOrgName());
-            origin.setOrgId(taInvoiceDetail.getOrgId());
-            origin.setOrgName(taInvoiceDetail.getOrgName());
-            origin.setTaxNo(taInvoiceDetail.getTaxNo());
-            origin.setAddress(taInvoiceDetail.getAddress());
-            origin.setPhone(taInvoiceDetail.getPhone());
-            origin.setBankId(taInvoiceDetail.getBankId());
-            origin.setBankName(taInvoiceDetail.getBankName());
-            origin.setCardNo(taInvoiceDetail.getCardNo());
-            origin.setPersonId(taInvoiceDetail.getPersonId());
-            origin.setMergeRemark(taInvoiceDetail.getMergeRemark());
-            origin.setStayRemark(taInvoiceDetail.getStayRemark());
-            origin.setMailAddress(taInvoiceDetail.getMailAddress());
-            origin.setMailPhone(taInvoiceDetail.getMailPhone());
-            origin.setMailUser(taInvoiceDetail.getMailUser());
-
-            return updateById(origin);
+            origin.setStatus(Constants.STATUS_READY);
+            updateById(origin);
+//            origin.setInvoicePersonId(taInvoiceDetail.getInvoicePersonId());
+//            origin.setPersonName(taInvoiceDetail.getPersonName());
+//            origin.setInvoiceOrgId(taInvoiceDetail.getInvoiceOrgId());
+//            origin.setInvoiceOrgName(taInvoiceDetail.getInvoiceOrgName());
+//            origin.setOrgId(taInvoiceDetail.getOrgId());
+//            origin.setOrgName(taInvoiceDetail.getOrgName());
+//            origin.setTaxNo(taInvoiceDetail.getTaxNo());
+//            origin.setAddress(taInvoiceDetail.getAddress());
+//            origin.setPhone(taInvoiceDetail.getPhone());
+//            origin.setBankId(taInvoiceDetail.getBankId());
+//            origin.setBankName(taInvoiceDetail.getBankName());
+//            origin.setCardNo(taInvoiceDetail.getCardNo());
+//            origin.setPersonId(taInvoiceDetail.getPersonId());
+//            origin.setMergeRemark(taInvoiceDetail.getMergeRemark());
+//            origin.setStayRemark(taInvoiceDetail.getStayRemark());
+//            origin.setMailAddress(taInvoiceDetail.getMailAddress());
+//            origin.setMailPhone(taInvoiceDetail.getMailPhone());
+//            origin.setMailUser(taInvoiceDetail.getMailUser());
+//
+//            return updateById(origin);
         }
 
         // 否则就是全新生成
+        taInvoiceDetail.setDetailId(null);
+        taInvoiceDetail.setStatus(Constants.STATUS_NORMAL);
         return save(taInvoiceDetail);
     }
 

src/main/java/com/njyunzhi/invoice/service/impl/TaInvoicePersonServiceImpl.java

@@ -3,6 +3,7 @@ package com.njyunzhi.invoice.service.impl;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.read.listener.PageReadListener;
 import com.alibaba.excel.support.ExcelTypeEnum;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.njyunzhi.invoice.common.Constants;
 import com.njyunzhi.invoice.common.DateUtils;
 import com.njyunzhi.invoice.common.StringUtils;
@@ -118,6 +119,11 @@ public class TaInvoicePersonServiceImpl extends BaseServiceImpl<TaInvoicePersonM
         return true;
     }
 
+    @Override
+    public IPage<TaInvoicePerson> getNoFillList(IPage<TaInvoicePerson> pg, String invoiceId) {
+        return baseMapper.getNoFillList(pg, invoiceId);
+    }
+
     private TaInvoiceOrg createByPerson(TaInvoicePerson taInvoicePerson) {
         TaInvoiceOrg taInvoiceOrg = new TaInvoiceOrg();
         taInvoiceOrg.setInvoiceId(taInvoicePerson.getInvoiceId());

src/main/resources/mapper/TaInvoiceDetailMapper.xml

@@ -75,7 +75,7 @@
         WHERE
             t.invoice_id = #{invoiceId}
           AND t.person_id = #{personId}
-          AND t.`status` > -1
+          AND t.`status` = 1
     </select>
 
     <sql id="getInvoiceDetail">
@@ -113,7 +113,7 @@
     <select id="getListByMainId" resultType="com.njyunzhi.invoice.entity.TaInvoiceDetail">
         <include refid="getInvoiceDetail"></include>
         WHERE
-            t.`status` &gt; -1
+            t.`status` = 1
             AND t.invoice_id = #{invoiceId}
         ORDER BY
             t.org_name ASC,
@@ -154,7 +154,7 @@
             ta_invoice_detail t
             INNER JOIN ta_invoice_fill s ON s.invoice_id = t.invoice_id
         WHERE
-            t.`status` &gt; -1
+            t.`status` = 1
         <if test="invoiceId != null and invoiceId != ''">
             AND t.invoice_id = #{invoiceId}
         </if>
@@ -194,7 +194,7 @@
     <select id="getPageBy" resultType="com.njyunzhi.invoice.entity.TaInvoiceDetail">
         <include refid="getInvoiceDetail"></include>
         WHERE
-            t.`status` &gt; -1
+            t.`status` = 1
             AND t.invoice_id = #{invoiceId}
         <if test="orgName != null and orgName != ''">
             AND t.org_name LIKE CONCAT( '%', #{orgName}, '%' )

src/main/resources/mapper/TaInvoicePersonMapper.xml

@@ -13,4 +13,26 @@
           AND t.`name` = #{name}
           AND t.`status` > -1
     </select>
+    <select id="getNoFillList" resultType="com.njyunzhi.invoice.entity.TaInvoicePerson">
+        SELECT
+            *
+        FROM
+            ta_invoice_person t
+        WHERE
+            t.invoice_id = #{invoiceId}
+          AND NOT EXISTS (
+                SELECT
+                    *
+                FROM
+                    ta_invoice_detail s
+                WHERE
+                    t.invoice_id = s.invoice_id
+                  AND t.invoice_org_id = s.invoice_org_id
+                  AND t.`name` = s.person_name
+            )
+          AND t.`status` &gt; - 1
+        ORDER BY
+            t.org_name ASC,
+            t.`name` ASC
+    </select>
 </mapper>