feats

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.njyunzhi.invoice.common.*;
 import com.njyunzhi.invoice.entity.*;
 import com.njyunzhi.invoice.service.ITaInvoiceFillService;
+import com.njyunzhi.invoice.service.ITaInvoiceItemService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -21,6 +22,7 @@ import com.njyunzhi.invoice.service.ITaInvoiceDetailService;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -45,6 +47,9 @@ public class TaInvoiceDetailController extends BaseController {
     @Autowired
     public ITaInvoiceFillService iTaInvoiceFillService;
 
+    @Autowired
+    public ITaInvoiceItemService iTaInvoiceItemService;
+
 
     /**
      * 分页查询列表
@@ -96,8 +101,8 @@ public class TaInvoiceDetailController extends BaseController {
         }
     }
 
-    @RequestMapping(value="/admin/invoice/{invoiceId}/detail-tpl/item/{itemId}",method= RequestMethod.POST)
-    @ApiOperation(value="添加或者修改项目", notes = "添加或者修改项目", httpMethod = "POST", response = ResponseBean.class)
+    @RequestMapping(value="/admin/invoice/{invoiceId}/detail-tpl/item/{itemId}",method= RequestMethod.DELETE)
+    @ApiOperation(value="删除模板项目", notes = "删除模板项目", httpMethod = "DELETE", response = ResponseBean.class)
     public ResponseBean createNew(@ApiParam("班级ID") @PathVariable(value ="invoiceId") String invoiceId,
                                   @ApiParam("报销项目ITEM") @PathVariable(value ="itemId") Integer itemId) throws Exception {
         if (iTaInvoiceDetailService.deleteItem(invoiceId, itemId)){
@@ -115,10 +120,10 @@ public class TaInvoiceDetailController extends BaseController {
         if (StringUtils.isEmpty(taInvoiceDetail.getInvoicePersonId())) {
             return ResponseBean.error("未选择报销人员");
         }
-
-        if (null == taInvoiceDetail.getItemList() || taInvoiceDetail.getItemList().size() < 1) {
-            return ResponseBean.error("未找到报销明细");
-        }
+//
+//        if (null == taInvoiceDetail.getItemList() || taInvoiceDetail.getItemList().size() < 1) {
+//            return ResponseBean.error("未找到报销明细");
+//        }
 
         TaInvoiceFill taInvoiceFill = iTaInvoiceFillService.getById(invoiceId);
         if (null == taInvoiceFill || taInvoiceFill.getStatus() == Constants.STATUS_DELETE) {
@@ -148,11 +153,16 @@ public class TaInvoiceDetailController extends BaseController {
     @ApiOperation(value="获取报销单信息", notes = "获取报销单信息", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean getDetailByPerson(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                           @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                          @ApiParam("班级ID") @PathVariable(value ="invoiceId") String invoiceId,
-                                          @ApiParam("人员名称") @RequestParam(value ="personName", required = false) String personName) throws Exception{
+                                          @ApiParam("班级ID") @PathVariable(value ="invoiceId", required = false) String invoiceId,
+                                          @ApiParam("人员ID") @PathVariable(value ="personId", required = false) String personId,
+                                          @ApiParam("人员名称") @RequestParam(value ="personName", required = false) String personName) throws Exception {
+
+        if (StringUtils.isEmpty(invoiceId) && StringUtils.isEmpty(personId)) {
+            return ResponseBean.error("人员ID或者班级ID不能为空");
+        }
 
         IPage<TaInvoiceDetail> page = new Page<>(pageNum, pageSize);
-        return ResponseBean.success(iTaInvoiceDetailService.getPersonPage(page, invoiceId, personName));
+        return ResponseBean.success(iTaInvoiceDetailService.getPersonPage(page, invoiceId, personId, personName));
     }
 
     @RequestMapping(value="/h5/invoice/{invoiceId}/detail/info",method= RequestMethod.GET)
@@ -192,6 +202,20 @@ public class TaInvoiceDetailController extends BaseController {
             return ResponseBean.error("找不到报销数据信息");
         }
 
+        // 获取明细
+        if (StringUtils.isEmpty(invoicePersonId)) {
+            invoicePersonId = taInvoiceDetail.getInvoicePersonId();
+        }
+
+        List<TaInvoiceItem> itemList = iTaInvoiceItemService.getListByPerson(invoiceId, invoicePersonId);
+        if (null != taInvoiceDetailTPl) {
+            taInvoiceDetailTPl.setItemList(itemList);
+        }
+        if (null != taInvoiceDetail) {
+            taInvoiceDetail.setItemList(itemList);
+        }
+
+
         Map<String, Object> resp = new HashMap<>();
         resp.put("detail", taInvoiceDetail);
         resp.put("tpl", taInvoiceDetailTPl);

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

@@ -108,7 +108,7 @@ public class TaInvoiceItemTplController extends BaseController {
         taInvoiceItemTpl.setInvoiceId(invoiceId);
         if (iTaInvoiceItemTplService.updateById(taInvoiceItemTpl)){
             return ResponseBean.success(iTaInvoiceItemTplService.getById(id));
-        }else {
+        } else {
             return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
         }
     }

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

@@ -33,12 +33,16 @@ public class TaInvoiceDetail implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "明细ID")
-    @TableId(value = "detail_id", type = IdType.INPUT)
+    @TableId(value = "detail_id", type = IdType.ASSIGN_UUID)
     private String detailId;
 
     @ApiModelProperty(value = "报销ID")
     private String invoiceId;
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "报销单名称")
+    private String invoiceName;
+
     @ApiModelProperty(value = "人员ID")
     private String invoicePersonId;
 
@@ -86,7 +90,7 @@ public class TaInvoiceDetail implements Serializable {
     private String cardNo;
 
     @ApiModelProperty(value = "报销项目ID")
-    private Integer invoiceItemTplId;
+    private Integer invoiceItemId;
 
     @ExcelProperty(index = 8)
     @ApiModelProperty(value = "报销项目")

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

@@ -32,7 +32,10 @@ public interface TaInvoiceDetailMapper extends BaseMapper<TaInvoiceDetail> {
 
     int removeTplById(@Param("id") String id);
 
-    IPage<TaInvoiceDetail> getPersonPage(IPage<TaInvoiceDetail> page, @Param("invoiceId") String invoiceId, @Param("personName") String personName);
+    IPage<TaInvoiceDetail> getPersonPage(IPage<TaInvoiceDetail> page,
+                                         @Param("invoiceId") String invoiceId,
+                                         @Param("personId") String personId,
+                                         @Param("personName") String personName);
 
     TaInvoiceDetail getTplByPerson(@Param("invoiceId") String invoiceId, @Param("invoicePersonId") String invoicePersonId);
 }

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

@@ -5,6 +5,8 @@ import com.njyunzhi.invoice.entity.TaInvoiceItem;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 报销项目模板 Mapper 接口
@@ -21,4 +23,6 @@ public interface TaInvoiceItemMapper extends BaseMapper<TaInvoiceItem> {
     TaInvoiceItem getByPersonAndName(@Param("invoiceId") String invoiceId,
                                      @Param("invoicePersonId") String invoicePersonId,
                                      @Param("name") String name);
+
+    List<TaInvoiceItem> getListByPerson(@Param("invoiceId") String invoiceId, @Param("invoicePersonId") String invoicePersonId);
 }

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

@@ -28,7 +28,7 @@ public interface ITaInvoiceDetailService extends IService<TaInvoiceDetail> {
 
     TaInvoiceDetail getTplByPerson(String invoiceId, String invoicePersonId);
 
-    IPage<TaInvoiceDetail> getPersonPage(IPage<TaInvoiceDetail> page, String invoiceId, String personName);
+    IPage<TaInvoiceDetail> getPersonPage(IPage<TaInvoiceDetail> page, String invoiceId, String personId, String personName);
 
     boolean createOrMergeInvoiceDetail(TaInvoiceDetail taInvoiceDetail);
 

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

@@ -3,6 +3,8 @@ package com.njyunzhi.invoice.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.njyunzhi.invoice.entity.TaInvoiceItem;
 
+import java.util.List;
+
 /**
  * <p>
  * 报销项目模板 服务类
@@ -13,4 +15,5 @@ import com.njyunzhi.invoice.entity.TaInvoiceItem;
  */
 public interface ITaInvoiceItemService extends IService<TaInvoiceItem> {
 
+    List<TaInvoiceItem> getListByPerson(String invoiceId, String invoicePersonId);
 }

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

@@ -13,6 +13,7 @@ import com.njyunzhi.invoice.mapper.TaInvoiceItemMapper;
 import com.njyunzhi.invoice.mapper.TaInvoiceItemTplMapper;
 import com.njyunzhi.invoice.service.ITaInvoiceDetailService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -72,22 +73,24 @@ public class TaInvoiceDetailServiceImpl extends ServiceImpl<TaInvoiceDetailMappe
     }
 
     @Override
-    public IPage<TaInvoiceDetail> getPersonPage(IPage<TaInvoiceDetail> page, String invoiceId, String personName) {
-        return baseMapper.getPersonPage(page, invoiceId, personName);
+    public IPage<TaInvoiceDetail> getPersonPage(IPage<TaInvoiceDetail> page, String invoiceId, String personId, String personName) {
+        return baseMapper.getPersonPage(page, invoiceId, personId, personName);
     }
 
     @Override
     public boolean createOrMergeInvoiceDetail(TaInvoiceDetail taInvoiceDetail) {
-        // 更新报销项目
-        for (TaInvoiceItem item : taInvoiceDetail.getItemList()) {
-            taInvoiceItemMapper.updateById(item);
-        }
+//        // 更新报销项目
+//        for (TaInvoiceItem item : taInvoiceDetail.getItemList()) {
+//            taInvoiceItemMapper.updateById(item);
+//        }
 
         // 查询原始记录
         TaInvoiceDetail origin = baseMapper.getByPerson(taInvoiceDetail.getInvoiceId(), taInvoiceDetail.getPersonId());
 
         // 如果不是新生成, 二次编辑
         if (null != origin) {
+            origin.setInvoicePersonId(taInvoiceDetail.getInvoicePersonId());
+            origin.setPersonName(taInvoiceDetail.getPersonName());
             origin.setInvoiceOrgId(taInvoiceDetail.getInvoiceOrgId());
             origin.setInvoiceOrgName(taInvoiceDetail.getInvoiceOrgName());
             origin.setOrgId(taInvoiceDetail.getOrgId());
@@ -99,6 +102,8 @@ public class TaInvoiceDetailServiceImpl extends ServiceImpl<TaInvoiceDetailMappe
             origin.setBankName(taInvoiceDetail.getBankName());
             origin.setCardNo(taInvoiceDetail.getCardNo());
             origin.setPersonId(taInvoiceDetail.getPersonId());
+            origin.setMergeRemark(taInvoiceDetail.getMergeRemark());
+            origin.setStayRemark(taInvoiceDetail.getStayRemark());
 
             return updateById(origin);
         }

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

@@ -6,6 +6,8 @@ import com.njyunzhi.invoice.mapper.TaInvoiceItemMapper;
 import com.njyunzhi.invoice.service.ITaInvoiceItemService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 报销项目模板 服务实现类
@@ -17,4 +19,8 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaInvoiceItemServiceImpl extends ServiceImpl<TaInvoiceItemMapper, TaInvoiceItem> implements ITaInvoiceItemService {
 
+    @Override
+    public List<TaInvoiceItem> getListByPerson(String invoiceId, String invoicePersonId) {
+        return baseMapper.getListByPerson(invoiceId, invoicePersonId);
+    }
 }

src/main/resources/mapper/TaInvoiceDetailMapper.xml

@@ -131,7 +131,7 @@
         WHERE
             t.invoice_id = #{invoiceId}
           AND t.`status` > -1
-          AND s.`status` > 1
+          AND s.`status` > -1
         ORDER BY
             t.org_name ASC,
             t.`name` ASC,
@@ -139,11 +139,19 @@
     </select>
     <select id="getPersonPage" resultType="com.njyunzhi.invoice.entity.TaInvoiceDetail">
         SELECT
-            t.*
+            t.*,
+            s.`name` as invoice_name
         FROM
             ta_invoice_detail t
+            INNER JOIN ta_invoice_fill s ON s.invoice_id = t.invoice_id
         WHERE
-            t.invoice_id = #{invoiceId}
+            t.`status` &gt; -1
+        <if test="invoiceId != null and invoiceId != ''">
+            AND t.invoice_id = #{invoiceId}
+        </if>
+          <if test="personId != null and personId != ''">
+              AND t.person_id = #{personId}
+          </if>
           <if test="personName != null and personName != ''">
               AND t.person_name LIKE CONCAT( '%', #{personName}, '%' )
           </if>

src/main/resources/mapper/TaInvoiceItemMapper.xml

@@ -30,4 +30,15 @@
           AND t.`name` = #{name}
           AND t.`status` = 1
     </select>
+    <select id="getListByPerson" resultType="com.njyunzhi.invoice.entity.TaInvoiceItem">
+        SELECT
+            *
+        FROM
+            ta_invoice_item t
+        WHERE
+            t.invoice_id = #{invoiceId}
+          AND t.`invoice_person_id` = #{invoicePersonId}
+          AND t.`status` = 1
+        ORDER BY t.`name` ASC
+    </select>
 </mapper>

src/main/resources/mapper/TaInvoiceOrgMapper.xml

@@ -6,10 +6,10 @@
         SELECT
             *
         FROM
-            ta_invoice_person t
+            ta_invoice_org t
         WHERE
             t.`status` > -1
           AND t.invoice_id = #{invoiceId}
-          AND t.org_name = #{orgName}
+          AND t.`name` = #{orgName}
     </select>
 </mapper>