no message

src/main/java/cn/ezhizao/project/business/receiveTicket/controller/BizFinancialReceiveTicketController.java

@@ -8,6 +8,8 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 
 import cn.ezhizao.common.utils.SecurityUtils;
+import cn.ezhizao.common.utils.StringUtils;
+import cn.ezhizao.project.business.company.domain.BizCompany;
 import cn.ezhizao.project.business.company.service.IBizCompanyService;
 import cn.ezhizao.project.business.keepAccounts.domain.BizFinancialKeepAccount;
 import cn.ezhizao.project.business.keepAccounts.domain.BizFinancialKeepAccountDetail;
@@ -49,8 +51,7 @@ import cn.ezhizao.framework.web.page.TableDataInfo;
  */
 @RestController
 @RequestMapping("/business/receiveTicket")
-public class BizFinancialReceiveTicketController extends BaseController
-{
+public class BizFinancialReceiveTicketController extends BaseController {
     @Resource
     private IBizFinancialReceiveTicketService bizFinancialReceiveTicketService;
     @Resource
@@ -78,8 +79,7 @@ public class BizFinancialReceiveTicketController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('business:receiveTicket:list')")
     @GetMapping("/list")
-    public TableDataInfo list(BizFinancialReceiveTicket bizFinancialReceiveTicket) throws NoSuchFieldException, IllegalAccessException
-    {
+    public TableDataInfo list(BizFinancialReceiveTicket bizFinancialReceiveTicket) throws NoSuchFieldException, IllegalAccessException {
         setTenantId(bizFinancialReceiveTicket);
         startPage();
         startOrderBy();
@@ -94,11 +94,16 @@ public class BizFinancialReceiveTicketController extends BaseController
         }
         return getDataTable(list);
     }
+
     @PreAuthorize("@ss.hasAnyPermi('business:receiveTicket:query,business:receiveTicket:view')")
     @PostMapping("/getDetail")
     public AjaxResult getDetail(@RequestBody BizFinancialReceiveTicketDetail details) {
         List<BizFinancialReceiveTicketDetail> bizFinancialSalaryDetails = financialReceiveTicketDetailService.getList(details);
         if (bizFinancialSalaryDetails.isEmpty()) {
+            if (StringUtils.isEmpty(details.getCompanyName())) {
+                BizCompany company = companyService.getById(details.getCompanyId());
+                details.setCompanyName(company == null ? "" : company.getName());
+            }
             return success(details);
         }
         return success(bizFinancialSalaryDetails.get(0));
@@ -112,32 +117,32 @@ public class BizFinancialReceiveTicketController extends BaseController
         BizFinancialSalaryDetail detail = financialSalaryDetailService.getList(conditions).stream().findFirst().orElse(null);
         return success(detail);
     }
+
     /**
      * 导出收票任务列表
      */
     @PreAuthorize("@ss.hasPermi('business:receiveTicket:export')")
     @Log(title = "收票任务", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, BizFinancialReceiveTicket bizFinancialReceiveTicket) throws NoSuchFieldException, IllegalAccessException
-    {
+    public void export(HttpServletResponse response, BizFinancialReceiveTicket bizFinancialReceiveTicket) throws NoSuchFieldException, IllegalAccessException {
         setTenantId(bizFinancialReceiveTicket);
         startOrderBy();
         bizFinancialReceiveTicket.setIsZero(0);
         List<BizFinancialReceiveTicket> list = bizFinancialReceiveTicketService.getList(bizFinancialReceiveTicket);
-        for(BizFinancialReceiveTicket l : list){
-            l.setCurrentPeriod(bizFinancialReceiveTicket.getYear()+"-"+bizFinancialReceiveTicket.getMonth());
+        for (BizFinancialReceiveTicket l : list) {
+            l.setCurrentPeriod(bizFinancialReceiveTicket.getYear() + "-" + bizFinancialReceiveTicket.getMonth());
             BizFinancialReceiveTicketDetail detail = new BizFinancialReceiveTicketDetail();
             detail.setFinancialReceiveTicketId(l.getId());
             detail.setYear(bizFinancialReceiveTicket.getYear());
             detail.setMonth(bizFinancialReceiveTicket.getMonth());
-            List<BizFinancialReceiveTicketDetail>ticketDetail  = financialReceiveTicketDetailService.getList(detail);
-            if(ticketDetail.size() == 0){
+            List<BizFinancialReceiveTicketDetail> ticketDetail = financialReceiveTicketDetailService.getList(detail);
+            if (ticketDetail.size() == 0) {
                 detail.setStatus(0);
                 l.setServiceName("");
-            }else{
-                detail=ticketDetail.get(0);
+            } else {
+                detail = ticketDetail.get(0);
                 SysUser sysUser = sysUserMapper.selectUserById(detail.getVerifierId());
-                l.setServiceName(sysUser==null?"":sysUser.getNickName());
+                l.setServiceName(sysUser == null ? "" : sysUser.getNickName());
             }
             //设置状态
             switch (detail.getStatus()) {
@@ -170,8 +175,7 @@ public class BizFinancialReceiveTicketController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('business:receiveTicket:query')")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
         return success(bizFinancialReceiveTicketService.getById(id));
     }
 
@@ -181,8 +185,7 @@ public class BizFinancialReceiveTicketController extends BaseController
     @PreAuthorize("@ss.hasPermi('business:receiveTicket:add')")
     @Log(title = "收票任务", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody BizFinancialReceiveTicket bizFinancialReceiveTicket) throws NoSuchFieldException, IllegalAccessException
-    {
+    public AjaxResult add(@RequestBody BizFinancialReceiveTicket bizFinancialReceiveTicket) throws NoSuchFieldException, IllegalAccessException {
         setTenantId(bizFinancialReceiveTicket);
         return toAjax(bizFinancialReceiveTicketService.save(bizFinancialReceiveTicket));
     }
@@ -193,8 +196,7 @@ public class BizFinancialReceiveTicketController extends BaseController
     @PreAuthorize("@ss.hasPermi('business:receiveTicket:edit')")
     @Log(title = "收票任务", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody BizFinancialReceiveTicket bizFinancialReceiveTicket) throws NoSuchFieldException, IllegalAccessException
-    {
+    public AjaxResult edit(@RequestBody BizFinancialReceiveTicket bizFinancialReceiveTicket) throws NoSuchFieldException, IllegalAccessException {
         setTenantId(bizFinancialReceiveTicket);
         return toAjax(bizFinancialReceiveTicketService.updateById(bizFinancialReceiveTicket));
     }
@@ -204,9 +206,8 @@ public class BizFinancialReceiveTicketController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('business:receiveTicket:remove')")
     @Log(title = "收票任务", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable List<Long> ids)
-    {
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable List<Long> ids) {
         return toAjax(bizFinancialReceiveTicketService.removeBatchByIds(ids));
     }
 
@@ -252,7 +253,7 @@ public class BizFinancialReceiveTicketController extends BaseController
             financialReceiveTicketFeedback.setRemark(detail.getFeedbackContent());
             financialReceiveTicketFeedbackService.save(financialReceiveTicketFeedback);
         }
-        if(detail.getStatus().equals(3)) {
+        if (detail.getStatus().equals(3)) {
             bool = bool && checkKeepAccount(detail);
         }
 //        return bool && financialReceiveTicketDetailService.updateById(detail) ? Rutils.success() : Rutils.error();
@@ -322,13 +323,13 @@ public class BizFinancialReceiveTicketController extends BaseController
     private boolean handleFeedback(BizFinancialReceiveTicketDetail detail) {
         // 判断是否有同步的反馈假设有则根据detail内容填写状态
         List<BizFinancialReceiveTicketFeedback> financialReceiveTicketFeedbacks = financialReceiveTicketFeedbackService.query().eq("financial_receive_ticket_detail_id", detail.getId()).eq("need_sync", 1).eq("status", 1).list();
-        if (financialReceiveTicketFeedbacks.isEmpty()){
+        if (financialReceiveTicketFeedbacks.isEmpty()) {
             return true;
         } else {
             financialReceiveTicketFeedbacks.forEach(l -> {
                 l.setFeedbackContent(getFeedbackContent(detail.getStatus()));
                 l.setFeedbackTime(DateTime.now().toTimestamp());
-                l.setStatus(detail.getStatus() >=3 ? 2 : l.getStatus());
+                l.setStatus(detail.getStatus() >= 3 ? 2 : l.getStatus());
             });
             return financialReceiveTicketFeedbackService.saveOrUpdateBatch(financialReceiveTicketFeedbacks);
         }
@@ -372,10 +373,10 @@ public class BizFinancialReceiveTicketController extends BaseController
                 financialKeepAccountDetail.setMonth(detail.getMonth());
                 financialKeepAccountDetail.setCompanyId(detail.getCompanyId());
                 List<BizFinancialSalaryDetailEmployee> employees = financialSalaryDetailEmployeeService.query().eq("financial_salary_detail_id", financialSalaryDetail.getId()).list();
-                financialKeepAccountDetail.setStatus(detail.getSumNumber().equals(0) && ((employees.size() == 1 && employees.stream().mapToDouble(v -> v.getActuallySalary().doubleValue()).sum()  == 0) || (employees.isEmpty())) ? 2 : 1);
+                financialKeepAccountDetail.setStatus(detail.getSumNumber().equals(0) && ((employees.size() == 1 && employees.stream().mapToDouble(v -> v.getActuallySalary().doubleValue()).sum() == 0) || (employees.isEmpty())) ? 2 : 1);
                 financialKeepAccountDetail.setReceiveDate((Timestamp) detail.getReceiveDate());
 //                financialKeepAccountDetailService.saveOrUpdate(financialKeepAccountDetail);
-                if(financialKeepAccountDetail.getId() == null) {
+                if (financialKeepAccountDetail.getId() == null) {
                     return financialKeepAccountDetailService.save(financialKeepAccountDetail);
                 } else {
                     return financialKeepAccountDetailService.updateById(financialKeepAccountDetail);