'客户发票信息表新增开票状态字段以及新增客户发票信息表-开票状态变更接口'

service-iot/service-iot-biz/src/main/java/com/usky/iot/controller/web/CrmInvoiceInfoController.java

@@ -10,12 +10,9 @@ import com.usky.iot.service.vo.CrmCustomInfoExportVO;
 import com.usky.iot.service.vo.CrmInvoiceInfoExportVO;
 import com.usky.iot.service.vo.CrmInvoiceInfoRequest;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.*;
 
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
@@ -47,6 +44,17 @@ public class CrmInvoiceInfoController {
         return ApiResult.success();
     }
 
+    /**
+     * 开票状态变更
+     * @param invoiceInfo
+     * @return
+     */
+    @PutMapping
+    public ApiResult<Void> update(@RequestBody CrmInvoiceInfo invoiceInfo){
+        crmInvoiceInfoService.update(invoiceInfo);
+        return ApiResult.success();
+    }
+
     /**
      * 分页
      * @param crmInvoiceInfoRequest

service-iot/service-iot-biz/src/main/java/com/usky/iot/domain/CrmInvoiceInfo.java

@@ -103,6 +103,11 @@ public class CrmInvoiceInfo implements Serializable {
      */
     private Integer tenantId;
 
+    /**
+     * 开票状态;1：未开票,2：已开票
+     */
+    private Integer invoiceStatus;
+
     /**
      * 项目编号
      */

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/CrmInvoiceInfoService.java

@@ -21,6 +21,8 @@ public interface CrmInvoiceInfoService extends CrudService<CrmInvoiceInfo> {
 
     void add(CrmInvoiceInfo invoiceInfo);
 
+    void update(CrmInvoiceInfo invoiceInfo);
+
     CommonPage<CrmInvoiceInfo> page(CrmInvoiceInfoRequest crmInvoiceInfoRequest);
 
     List<CrmInvoiceInfoExportVO> export(CrmInvoiceInfoRequest crmInvoiceInfoRequest);

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/CrmInvoiceInfoServiceImpl.java

@@ -45,9 +45,15 @@ public class CrmInvoiceInfoServiceImpl extends AbstractCrudService<CrmInvoiceInf
         crmInvoiceInfo.setCreateBy(SecurityUtils.getUsername());
         crmInvoiceInfo.setCreateTime(LocalDateTime.now());
         crmInvoiceInfo.setTenantId(SecurityUtils.getTenantId());
+        crmInvoiceInfo.setInvoiceStatus(1);
         this.save(crmInvoiceInfo);
     }
 
+    @Override
+    public void update(CrmInvoiceInfo invoiceInfo){
+        this.updateById(invoiceInfo);
+    }
+
     @Override
     public CommonPage<CrmInvoiceInfo> page(CrmInvoiceInfoRequest crmInvoiceInfoRequest){
         IPage<CrmInvoiceInfo> page = new Page<>(crmInvoiceInfoRequest.getCurrent(),crmInvoiceInfoRequest.getSize());
@@ -75,6 +81,7 @@ public class CrmInvoiceInfoServiceImpl extends AbstractCrudService<CrmInvoiceInf
                 exportVO.setSendAddress(list1.get(i).getSendAddress());
                 exportVO.setPaymentReceipt(list1.get(i).getPaymentReceipt());
                 exportVO.setCreateTime(list1.get(i).getCreateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+                exportVO.setInvoiceStatus(list1.get(i).getInvoiceStatus());  //开票状态;1：未开票,2：已开票
 
                 list.add(exportVO);
             }

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/vo/CrmInvoiceInfoExportVO.java

@@ -51,6 +51,12 @@ public class CrmInvoiceInfoExportVO  implements Serializable {
     @Excel(name = "金额")
     private String amount;
 
+    /**
+     * 开票状态;1：未开票,2：已开票
+     */
+    @Excel(name = "开票状态", readConverterExp = "1=未开票,2=已开票")
+    private Integer invoiceStatus;
+
     /**
      * 申请人
      */

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/vo/CrmInvoiceInfoRequest.java

@@ -24,6 +24,11 @@ public class CrmInvoiceInfoRequest {
      */
     private String invoiceTitle;
 
+    /**
+     * 开票状态;1：未开票,2：已开票
+     */
+    private Integer invoiceStatus;
+
     /**
      * 开始时间
      */

service-iot/service-iot-biz/src/main/resources/mapper/iot/CrmInvoiceInfoMapper.xml

@@ -36,6 +36,9 @@
             <if test="gr.invoiceTitle != null">
                 and ci.invoice_title like CONCAT('%',#{gr.invoiceTitle},'%')
             </if>
+            <if test="gr.invoiceStatus != null">
+                and ci.invoice_status = #{gr.invoiceStatus}
+            </if>
             <if test="gr.startTime != null and gr.startTime != '' and gr.endTime != null and gr.endTime != ''">
                 and  ci.create_time BETWEEN  #{gr.startTime} AND  #{gr.endTime}
             </if>
@@ -56,6 +59,9 @@
             <if test="gr.invoiceTitle != null">
                 and ci.invoice_title like CONCAT('%',#{gr.invoiceTitle},'%')
             </if>
+            <if test="gr.invoiceStatus != null">
+                and ci.invoice_status = #{gr.invoiceStatus}
+            </if>
             <if test="gr.startTime != null and gr.startTime != '' and gr.endTime != null and gr.endTime != ''">
                 and  ci.create_time BETWEEN  #{gr.startTime} AND  #{gr.endTime}
             </if>