提交

src/main/java/cn/ezhizao/framework/web/domain/BaseEntity.java

@@ -40,7 +40,7 @@ public class BaseEntity implements Serializable
     /** 创建时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField(value="create_time",fill= FieldFill.INSERT)
-    @Excel(name = "创建日期", width = 30, dateFormat = "yyyy-MM-dd",sort = 99)
+//    @Excel(name = "创建日期", width = 30, dateFormat = "yyyy-MM-dd",sort = 99)
     private Date createTime;
 
     /** 更新者 */
@@ -71,7 +71,7 @@ public class BaseEntity implements Serializable
     private Date updateTime;
 
     /** 备注 */
-    @Excel(name = "备注", sort = 100)
+//    @Excel(name = "备注", sort = 100)
     private String remark;
 
     /** 请求参数 */

src/main/java/cn/ezhizao/project/business/account/domain/BizAccount.java

@@ -24,17 +24,17 @@ public class BizAccount extends BaseEntity
     private Long tenantId;
 
     /** 账户名称 */
-    @Excel(name = "账户名称")
+    @Excel(name = "账户名称", sort = 1)
     @ApiModelProperty(value = "账户名称")
     private String name;
 
     /** 账号 */
-    @Excel(name = "账号")
+    @Excel(name = "账号", sort = 2)
     @ApiModelProperty(value = "账号")
     private String accountNum;
 
     /** 开户行 */
-    @Excel(name = "开户行")
+    @Excel(name = "开户行", sort = 3)
     @ApiModelProperty(value = "开户行")
     private String accountOpen;
 

src/main/java/cn/ezhizao/project/business/channel/controller/BizChannelController.java

@@ -39,7 +39,7 @@ public class BizChannelController extends BaseController
     /**
      * 查询渠道列表
      */
-    @PreAuthorize("@ss.hasPermi('business:channel:list')")
+//    @PreAuthorize("@ss.hasPermi('business:channel:list')")
     @GetMapping("/list")
     public TableDataInfo list(BizChannel bizChannel) throws NoSuchFieldException, IllegalAccessException
     {

src/main/java/cn/ezhizao/project/business/company/controller/BizCompanyController.java

@@ -89,9 +89,9 @@ public class BizCompanyController extends BaseController
         List<BizCompany> list = bizCompanyService.getList(bizCompany);
         ExcelUtil<BizCompany> util = new ExcelUtil<BizCompany>(BizCompany.class);
         if (bizCompany.getColumns() != null && !bizCompany.getColumns().isEmpty()) {
-            util.exportExcel(response, list, "company数据", "客户信息导出", bizCompany.getColumns().toArray(new String[0]));
+            util.exportExcel(response, list, "客户数据", "客户信息导出", bizCompany.getColumns().toArray(new String[0]));
         } else {
-            util.exportExcel(response, list, "company数据", "客户信息导出");
+            util.exportExcel(response, list, "客户数据", "客户信息导出");
         }
     }
 
@@ -157,7 +157,6 @@ public class BizCompanyController extends BaseController
     public AjaxResult add(@RequestBody BizCompany bizCompany) throws NoSuchFieldException, IllegalAccessException
     {
         setTenantId(bizCompany);
-
         return bizCompanyService.save(bizCompany) ? success("保存成功", bizCompany)  : error("保存失败");
     }
 
@@ -192,7 +191,7 @@ public class BizCompanyController extends BaseController
     public void importTemplate(HttpServletResponse response)
     {
         ExcelUtil<BizCompany> util = new ExcelUtil<>(BizCompany.class);
-        util.importTemplateExcel(response, "客户数据", StringUtils.EMPTY, new String[]{"name", "sourceCategoryName", "sourceName"});
+        util.importTemplateExcel(response, "客户数据", StringUtils.EMPTY, new String[]{"name", "sourceCategoryName", "sourceName","leaderName","adviserName"});
     }
 
     @PostMapping("/setCompanyAdviser")

src/main/java/cn/ezhizao/project/business/company/domain/BizCompany.java

@@ -38,7 +38,7 @@ public class BizCompany extends BaseEntity
     private String code;
 
     /** 客户名称 */
-    @Excel(name = "客户名称")
+    @Excel(name = "客户名称",width = 35)
     @ApiModelProperty(value = "客户名称")
     @Size(min = 0, max = 100)
     private String name;
@@ -361,8 +361,10 @@ public class BizCompany extends BaseEntity
     @ApiModelProperty("客服")
     private Long adviserId;
 
+    @Excel(name = "负责人")
     @TableField(exist = false)
     private String leaderName;
+    @Excel(name = "客服")
     @TableField(exist = false)
     private String adviserName;
     @TableField(exist = false)

src/main/java/cn/ezhizao/project/business/company/service/impl/BizCompanyServiceImpl.java

@@ -111,6 +111,18 @@ public class BizCompanyServiceImpl  extends ServiceImpl<BizCompanyMapper, BizCom
                     BeanValidators.validateWithException(validator, company);
                     String sourceName = company.getSourceName();
                     String sourceCategory = company.getSourceCategoryName();
+                    if(company.getLeaderName()!= null){
+                        SysUser user = sysUserMapper.selectUserByUserName(company.getLeaderName());
+                        if (user != null) {
+                            company.setLeaderId(user.getUserId());
+                        }
+                    }
+                    if(company.getAdviserName()!=null){
+                        SysUser user = sysUserMapper.selectUserByUserName(company.getAdviserName());
+                        if (user != null) {
+                            company.setAdviserId(user.getUserId());
+                        }
+                    }
                     company.setTenantId(tenantId);
                     BizSource source = sources.stream().filter(v -> v.getTitle().equals(sourceCategory)).findFirst().orElse(null);
                     if (source != null) {

src/main/java/cn/ezhizao/project/business/order/domain/BizArchiveInput.java

@@ -90,7 +90,7 @@ public class BizArchiveInput extends BaseEntity {
     /**
      * 入库人外键
      */
-    @ApiModelProperty(value = "结束月")
+    @ApiModelProperty(value = "入库人外键")
     private Long inputEmployeeId;
 
     /**

src/main/java/cn/ezhizao/project/business/workOrder/controller/BizWorkOrderController.java

@@ -4,6 +4,7 @@ import java.math.BigDecimal;
 import java.math.MathContext;
 import java.math.RoundingMode;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
@@ -25,6 +26,7 @@ import cn.ezhizao.project.business.order.service.IBizArchiveInputDetailProcessSe
 import cn.ezhizao.project.business.order.service.IBizArchiveInputDetailService;
 import cn.ezhizao.project.business.order.service.impl.BizArchiveInputServiceImpl;
 import cn.ezhizao.project.business.workOrder.domain.BizWorkOrderDetail;
+import cn.ezhizao.project.business.workOrder.domain.BizWorkOrderNoContract;
 import cn.ezhizao.project.business.workOrder.service.IBizWorkOrderDetailService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.transaction.annotation.Transactional;
@@ -109,40 +111,40 @@ public class BizWorkOrderController extends BaseController {
 
                 //查询合同收款金额
                 BizArchiveInput bizArchiveInput = bizArchiveInputService.getById(v.getContractId());
-                BigDecimal money=new BigDecimal(0);
-                if(bizArchiveInput!=null){
+                BigDecimal money = new BigDecimal(0);
+                if (bizArchiveInput != null) {
                     money = bizArchiveInput.getTrueAmount();
                 }
 
                 //如果是单次工单
                 if (v.getType() == 2) {
-                    BizCollection collection =new BizCollection();
+                    BizCollection collection = new BizCollection();
                     collection.setContractId(v.getContractId());
                     collection.setStatus(1);
                     //查询收款数据
-                    List<BizCollection>  colList =bizCollectionService.getList(collection);
+                    List<BizCollection> colList = bizCollectionService.getList(collection);
                     //已收款金额
                     BigDecimal collectionMoney = new BigDecimal(0);
                     //计算收款金额
                     for (BizCollection d : colList) {
                         BigDecimal addMoney = d.getAmount();
-                        if (addMoney!=null) {
-                            collectionMoney=collectionMoney.add(addMoney);
-                        }else{
-                            addMoney=new BigDecimal(0);
+                        if (addMoney != null) {
+                            collectionMoney = collectionMoney.add(addMoney);
+                        } else {
+                            addMoney = new BigDecimal(0);
                         }
                     }
                     //判断是否全部收款
-                     if (collectionMoney.compareTo(money) == 0) {
+                    if (collectionMoney.compareTo(money) == 0) {
                         v.setOnceContractStatus("已收款");
                     } else if (collectionMoney.compareTo(money) < 0) {
                         v.setOnceContractStatus("部分收款");
-                    }else if (collectionMoney.compareTo(new BigDecimal(0)) == 0) {
+                    } else if (collectionMoney.compareTo(new BigDecimal(0)) == 0) {
                         v.setOnceContractStatus("未收款");
                     }
                 }
                 //如果是循环工单
-                if (v.getType() == 1 && detailList.size()>0) {
+                if (v.getType() == 1 && detailList.size() > 0) {
 
                     //判断是否有起始月份
                     BizArchiveInputDetail detail = new BizArchiveInputDetail();
@@ -153,12 +155,12 @@ public class BizWorkOrderController extends BaseController {
                         //月数
                         Integer monthNum = 0;
                         //如果只有一个合同
-                        if(detailList.size()==1){
+                        if (detailList.size() == 1) {
                             //且收款金额为0
-                            if(detailList.get(0).getTotalityMoney()==null||detailList.get(0).getTotalityMoney().compareTo(new BigDecimal(0))==0){
+                            if (detailList.get(0).getTotalityMoney() == null || detailList.get(0).getTotalityMoney().compareTo(new BigDecimal(0)) == 0) {
                                 v.setClosingMonth("未收款");
                             }
-                        }else {
+                        } else {
                             //根据单价计算月数
                             for (BizWorkOrderDetail d : detailList) {
                                 //如果收款金额大于0
@@ -223,8 +225,8 @@ public class BizWorkOrderController extends BaseController {
             v.setEntrusts(entrusts.stream().filter(e -> e.getWorkOrderId().equals(v.getId())).collect(Collectors.toList()));
         });
 
-        for (BizWorkOrder v:list){
-            if(v.getNoContract()==1){
+        for (BizWorkOrder v : list) {
+            if (v.getNoContract() == 1) {
                 v.setTaskTypeName(v.getRemark());
             }
         }
@@ -233,19 +235,49 @@ public class BizWorkOrderController extends BaseController {
     }
 
 
-        /**
-         * 导出工单信息列表
-         */
+    /**
+     * 导出工单信息列表
+     */
     @PreAuthorize("@ss.hasPermi('business:workOrder:export')")
     @Log(title = "工单信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, BizWorkOrder bizWorkOrder) throws NoSuchFieldException, IllegalAccessException {
         setTenantId(bizWorkOrder);
+        startPage();
+        startOrderBy();
         List<BizWorkOrder> list = bizWorkOrderService.getList(bizWorkOrder);
         ExcelUtil<BizWorkOrder> util = new ExcelUtil<BizWorkOrder>(BizWorkOrder.class);
         util.exportExcel(response, list, "工单信息数据");
     }
 
+    /**
+     * 导出工单信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('business:workOrder:export')")
+    @Log(title = "工单信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/exportNoContract")
+    public void exportNoContract(HttpServletResponse response, BizWorkOrder bizWorkOrder) throws NoSuchFieldException, IllegalAccessException {
+        setTenantId(bizWorkOrder);
+        startPage();
+        startOrderBy();
+        List<BizWorkOrder> list = bizWorkOrderService.getList(bizWorkOrder);
+        List<BizWorkOrderNoContract> listNoContract = new ArrayList<>();
+        BizEntrust bizEntrust = new BizEntrust();
+        bizEntrust.setWorkOrderIds(list.stream().map(BizWorkOrder::getId).collect(Collectors.toList()));
+        List<BizEntrust> entrusts = entrustService.getList(bizEntrust);
+        list.forEach(l -> {
+            l.setEntrust(entrusts.stream().filter(v -> v.getWorkOrderId().equals(l.getId())).findFirst().orElse(null));
+            BizWorkOrderNoContract noContract = new BizWorkOrderNoContract();
+            noContract.setRemark(l.getRemark());
+            noContract.setSocialCreditCode(l.getSocialCreditCode());
+            noContract.setCompanyName(l.getCompanyName());
+            noContract.setServiceName(l.getEntrust() == null ? l.getServiceName() : l.getEntrust().getToAccountName());
+            listNoContract.add(noContract);
+        });
+        ExcelUtil<BizWorkOrderNoContract> util = new ExcelUtil<BizWorkOrderNoContract>(BizWorkOrderNoContract.class);
+        util.exportExcel(response, listNoContract, "工单信息数据");
+    }
+
     /**
      * 获取工单信息详细信息
      */

src/main/java/cn/ezhizao/project/business/workOrder/controller/WorkOrderServiceController.java

@@ -1,5 +1,8 @@
 package cn.ezhizao.project.business.workOrder.controller;
 
+import cn.ezhizao.common.utils.poi.ExcelUtil;
+import cn.ezhizao.framework.aspectj.lang.annotation.Log;
+import cn.ezhizao.framework.aspectj.lang.enums.BusinessType;
 import cn.ezhizao.framework.web.controller.BaseController;
 import cn.ezhizao.framework.web.domain.AjaxResult;
 import cn.ezhizao.framework.web.page.TableDataInfo;
@@ -31,8 +34,7 @@ import cn.ezhizao.project.business.salary.service.IBizFinancialSalaryDetailServi
 import cn.ezhizao.project.business.salary.service.IBizFinancialSalaryService;
 import cn.ezhizao.project.business.socialSecurity.domain.*;
 import cn.ezhizao.project.business.socialSecurity.service.*;
-import cn.ezhizao.project.business.workOrder.domain.BizWorkOrder;
-import cn.ezhizao.project.business.workOrder.domain.BizWorkOrderRecord;
+import cn.ezhizao.project.business.workOrder.domain.*;
 import cn.ezhizao.project.business.workOrder.service.IBizWorkOrderRecordService;
 import cn.ezhizao.project.business.workOrder.service.IBizWorkOrderService;
 import cn.ezhizao.project.system.domain.SysFileStorage;
@@ -42,6 +44,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -105,8 +108,7 @@ public class WorkOrderServiceController extends BaseController {
     @PreAuthorize("@ss.hasPermi('business:customer:service:loop:list')")
     @GetMapping("/list")
 
-    public TableDataInfo list(BizWorkOrder bizWorkOrder) throws NoSuchFieldException, IllegalAccessException
-    {
+    public TableDataInfo list(BizWorkOrder bizWorkOrder) throws NoSuchFieldException, IllegalAccessException {
         setTenantId(bizWorkOrder);
         bizWorkOrder.setType(1);
         startPage();
@@ -121,17 +123,94 @@ public class WorkOrderServiceController extends BaseController {
         entrustConditions.setWorkOrderIds(list.stream().map(BizWorkOrder::getId).collect(Collectors.toList()));
         entrustConditions.setCurrentYear(bizWorkOrder.getYear());
         List<BizEntrust> entrusts = entrustService.getList(entrustConditions);
-        list.forEach(v ->  {
+        list.forEach(v -> {
             v.setRecords(records.stream().filter(e -> e.getWorkOrderId().equals(v.getId())).collect(Collectors.toList()));
             v.setEntrusts(entrusts.stream().filter(e -> e.getWorkOrderId().equals(v.getId())).collect(Collectors.toList()));
         });
         return getDataTable(list);
     }
 
+    //导出循环工单
+    @Log(title = "循环工单", businessType = BusinessType.EXPORT)
+    @PreAuthorize("@ss.hasPermi('business:customer:service:loop:exportLoop')")
+    @PostMapping("/exportLoop")
+    public void exportLoop(HttpServletResponse response, BizWorkOrder bizWorkOrder) throws NoSuchFieldException, IllegalAccessException {
+        setTenantId(bizWorkOrder);
+        bizWorkOrder.setType(1);
+        startPage();
+        startOrderBy();
+        List<BizWorkOrder> list = bizWorkOrderService.getList(bizWorkOrder);
+        List<BizWorkOrderLoop> listLoop = new ArrayList<>();
+        BizWorkOrderRecord bizWorkOrderRecord = new BizWorkOrderRecord();
+        bizWorkOrderRecord.setWorkOrderIds(list.stream().map(BizWorkOrder::getId).collect(Collectors.toList()));
+        bizWorkOrderRecord.setYear(bizWorkOrder.getYear());
+        List<BizWorkOrderRecord> records = bizWorkOrderRecordService.getList(bizWorkOrderRecord);
+        BizEntrust entrustConditions = new BizEntrust();
+        entrustConditions.setWorkOrderIds(list.stream().map(BizWorkOrder::getId).collect(Collectors.toList()));
+        entrustConditions.setCurrentYear(bizWorkOrder.getYear());
+        List<BizEntrust> entrusts = entrustService.getList(entrustConditions);
+        list.forEach(v -> {
+            v.setRecord(records.stream().filter(e -> e.getWorkOrderId().equals(v.getId())
+                    && e.getMonth().equals(bizWorkOrder.getMonth())
+                    && e.getFromId().equals(0L) &&
+                    e.getYear().equals(bizWorkOrder.getYear())).findFirst().orElse(null));
+            v.setEntrust(entrusts.stream().filter(e -> e.getWorkOrderId().equals(v.getId())).findFirst().orElse(null));
+            BizWorkOrderLoop loop = new BizWorkOrderLoop();
+            loop.setCompanyName(v.getCompanyName());
+            loop.setTaxType(v.getTaxType());
+            loop.setSocialCreditCode(v.getSocialCreditCode());
+            loop.setTaskTypeName(v.getTaskTypeName());
+            loop.setPeriod(bizWorkOrder.getYear() + "年" + bizWorkOrder.getMonth() + "月");
+            loop.setStatus(v.getRecord() == null ? 0 : v.getRecord().getStatus());
+            loop.setServiceName(v.getEntrust() == null ? v.getServiceName() : v.getEntrust().getToAccountName());
+            ;
+            listLoop.add(loop);
+
+        });
+
+        ExcelUtil<BizWorkOrderLoop> util = new ExcelUtil<BizWorkOrderLoop>(BizWorkOrderLoop.class);
+        util.exportExcel(response, listLoop, "循环服务数据");
+    }
+
+    //导出单次工单
+    @Log(title = "单次工单", businessType = BusinessType.EXPORT)
+    @PreAuthorize("@ss.hasPermi('business:customer:service:once:exportOnce')")
+    @PostMapping("/exportOnce")
+    public void exportOnce(HttpServletResponse response, BizWorkOrder bizWorkOrder) throws NoSuchFieldException, IllegalAccessException {
+        setTenantId(bizWorkOrder);
+        bizWorkOrder.setType(2);
+        startPage();
+        startOrderBy();
+        List<BizWorkOrder> list = bizWorkOrderService.getList(bizWorkOrder);
+        List<BizWorkOrderOnce> listOnce = new ArrayList<>();
+        BizWorkOrderRecord bizWorkOrderRecord = new BizWorkOrderRecord();
+        bizWorkOrderRecord.setWorkOrderIds(list.stream().map(BizWorkOrder::getId).collect(Collectors.toList()));
+        List<BizWorkOrderRecord> records = bizWorkOrderRecordService.getList(bizWorkOrderRecord);
+        BizEntrust entrustConditions = new BizEntrust();
+        entrustConditions.setWorkOrderIds(list.stream().map(BizWorkOrder::getId).collect(Collectors.toList()));
+        entrustConditions.setCurrentYear(bizWorkOrder.getYear());
+        List<BizEntrust> entrusts = entrustService.getList(entrustConditions);
+        list.forEach(v -> {
+            v.setRecord(records.stream().filter(e -> e.getWorkOrderId().equals(v.getId()) && e.getFromId().equals(0L)).findFirst().orElse(null));
+            v.setEntrust(entrusts.stream().filter(e -> e.getWorkOrderId().equals(v.getId())).findFirst().orElse(null));
+            BizWorkOrderOnce once = new BizWorkOrderOnce();
+            once.setCompanyName(v.getCompanyName());
+            once.setSocialCreditCode(v.getSocialCreditCode());
+            once.setStatus(v.getRecord() == null ? 0 : v.getRecord().getStatus());
+            once.setRemark(v.getNoContract() == 1 ? v.getRemark() : v.getTaskTypeName() + (v.getTaskTypeDetailName() != null ? "-" + v.getTaskTypeDetailName() : ""));
+            once.setServiceName(v.getEntrust() == null ? v.getServiceName() : v.getEntrust().getToAccountName());
+            once.setIsStop(v.getIsStop());
+            listOnce.add(once);
+
+        });
+
+        ExcelUtil<BizWorkOrderOnce> util = new ExcelUtil<BizWorkOrderOnce>(BizWorkOrderOnce.class);
+        util.exportExcel(response, listOnce, "单次服务数据");
+    }
+
     @PreAuthorize("@ss.hasPermi('business:customer:service:once:list')")
     @GetMapping("/onceList")
-    public TableDataInfo onceList(BizWorkOrder bizWorkOrder) throws NoSuchFieldException, IllegalAccessException
-    {
+    public TableDataInfo onceList(BizWorkOrder bizWorkOrder) throws NoSuchFieldException, IllegalAccessException {
         setTenantId(bizWorkOrder);
         bizWorkOrder.setType(2);
         startPage();
@@ -340,6 +419,7 @@ public class WorkOrderServiceController extends BaseController {
         }
         return success(record);
     }
+
     @PreAuthorize("@ss.hasAnyPermi('business:customer:service:once:query,business:customer:service:once:edit,business:customer:service:once:view,business:customer:service:once:verify')")
     @PostMapping("/getOnceDetail")
     public AjaxResult getOnceDetail(@RequestBody BizWorkOrderRecord bizWorkOrderRecord) {
@@ -392,7 +472,7 @@ public class WorkOrderServiceController extends BaseController {
             bizFinancialReportTaxDetailService.saveOrUpdate(reportTaxDetail);
             bizFinancialIndividualIncomeTaxDetailService.saveOrUpdate(individualIncomeTaxDetail);
         }
-        if(workOrder.getTaskTypeId().equals(2L)) {
+        if (workOrder.getTaskTypeId().equals(2L)) {
             // 保存所有社保项
             BizSocialSecurityConfirmDetail confirmDetail = bizWorkOrderRecord.getSocialSecurityConfirm();
             confirmDetail.setCompanyId(workOrder.getCompanyId());
@@ -422,7 +502,7 @@ public class WorkOrderServiceController extends BaseController {
             fileStorageService.physicalDelete(delCondition);
             fileStorageService.saveOrUpdateBatch(fileStorages);
         }
-        if(workOrder.getTaskTypeId().equals(3L)) {
+        if (workOrder.getTaskTypeId().equals(3L)) {
             // 保存所有公积金项
             BizHousingFundConfirmDetail confirmDetail = bizWorkOrderRecord.getHousingFundConfirm();
             BizHousingFundDeclareDetail declareDetail = bizWorkOrderRecord.getHousingFundDeclare();
@@ -454,6 +534,7 @@ public class WorkOrderServiceController extends BaseController {
         }
         return toAjax(status);
     }
+
     @PreAuthorize("@ss.hasAnyPermi('business:customer:service:once:edit')")
     @PostMapping("/saveOnceDetail")
     @Transactional(rollbackFor = Exception.class)

src/main/java/cn/ezhizao/project/business/workOrder/domain/BizWorkOrder.java

@@ -37,10 +37,14 @@ public class BizWorkOrder extends BaseEntity {
     private Long companyId;
 
     @ApiModelProperty("客户名称")
-    @Excel(name = "客户名称", sort = 1)
+    @Excel(name = "客户名称",width = 35, sort = 1)
     @TableField(exist = false)
     private String companyName;
 
+    @ApiModelProperty("纳税性质")
+    @TableField(exist = false)
+    private String taxType;
+
     @ApiModelProperty("税号")
     @TableField(exist = false)
     private String socialCreditCode;
@@ -61,14 +65,12 @@ public class BizWorkOrder extends BaseEntity {
     /**
      * 无合同
      */
-    @Excel(name = "无合同", readConverterExp = "0=合同工单,1=非合同工单", sort = 3)
     @ApiModelProperty(value = "无合同")
     private Integer noContract;
 
     /**
      * 编号
      */
-    @Excel(name = "编号", sort = 4)
     @ApiModelProperty(value = "编号")
     private String workOrderNo;
 
@@ -108,7 +110,7 @@ public class BizWorkOrder extends BaseEntity {
      * 开始月
      */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "开始月", width = 30, dateFormat = "yyyy年MM月", sort = 7)
+    @Excel(name = "开始月", width = 15, dateFormat = "yyyy年MM月", sort = 7)
     @ApiModelProperty(value = "开始月")
     private Date startMonth;
 
@@ -116,7 +118,7 @@ public class BizWorkOrder extends BaseEntity {
      * 结束月
      */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "结束月", width = 30, dateFormat = "yyyy年MM月", sort = 8)
+    @Excel(name = "结束月", width = 15, dateFormat = "yyyy年MM月", sort = 8)
     @ApiModelProperty(value = "结束月")
     private Date endMonth;
 
@@ -142,7 +144,6 @@ public class BizWorkOrder extends BaseEntity {
     /**
      * 停止任务
      */
-    @Excel(name = "停止任务", sort = 10, readConverterExp = "0=正常,1=停止")
     @ApiModelProperty(value = "停止任务")
     private Integer isStop;
 
@@ -154,7 +155,7 @@ public class BizWorkOrder extends BaseEntity {
     /**
      * 省
      */
-    @Excel(name = "省", sort = 11)
+//    @Excel(name = "省", sort = 11)
     @ApiModelProperty(value = "省")
     private String province;
 
@@ -168,7 +169,7 @@ public class BizWorkOrder extends BaseEntity {
     /**
      * 市
      */
-    @Excel(name = "市", sort = 12)
+//    @Excel(name = "市", sort = 12)
     @ApiModelProperty(value = "市")
     private String city;
 
@@ -182,7 +183,7 @@ public class BizWorkOrder extends BaseEntity {
     /**
      * 区
      */
-    @Excel(name = "区", sort = 13)
+//    @Excel(name = "区", sort = 13)
     @ApiModelProperty(value = "区")
     private String district;
 
@@ -191,6 +192,9 @@ public class BizWorkOrder extends BaseEntity {
     @TableField(exist = false)
     private List<BizWorkOrderDetail> details;
 
+    @TableField(exist = false)
+    private BizWorkOrderRecord record;
+
     /**
      * 服务管理查询条件
      */
@@ -211,6 +215,9 @@ public class BizWorkOrder extends BaseEntity {
     @TableField(exist = false)
     private List<BizEntrust> entrusts;
 
+    @TableField(exist = false)
+    private BizEntrust entrust;
+
     @TableField(exist = false)
     private List<Long> ids;
 

src/main/java/cn/ezhizao/project/business/workOrder/domain/BizWorkOrderLoop.java

@@ -0,0 +1,226 @@
+package cn.ezhizao.project.business.workOrder.domain;
+
+import cn.ezhizao.framework.aspectj.lang.annotation.Excel;
+import cn.ezhizao.framework.web.domain.BaseEntity;
+import cn.ezhizao.project.business.entrust.domain.BizEntrust;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 工单信息对象 biz_work_order
+ *
+ * @author ruoyi
+ * @date 2023-10-16
+ */
+@Data
+@TableName(value = "biz_work_order")
+public class BizWorkOrderLoop extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 合同外键
+     */
+    @ApiModelProperty(value = "${comment}")
+    private Long contractId;
+
+    /**
+     * 客户外键
+     */
+    @ApiModelProperty(value = "${comment}")
+    private Long companyId;
+
+    @ApiModelProperty("客户名称")
+    @Excel(name = "客户名称",width = 35, sort = 1)
+    @TableField(exist = false)
+    private String companyName;
+
+    @Excel(name = "纳税性质", sort = 2)
+    @ApiModelProperty("纳税性质")
+    private String taxType;
+
+    @Excel(name = "税号", sort = 3,width = 25)
+    @ApiModelProperty("税号")
+    @TableField(exist = false)
+    private String socialCreditCode;
+
+    @ApiModelProperty("合同明细外键")
+    private Long contractDetailId;
+
+    @ApiModelProperty("合同流程外键")
+    private Long contractDetailProcessId;
+
+    /**
+     * 工单类型 1循环 2代办
+     */
+//    @Excel(name = "工单类型", readConverterExp = "1=循环工单,2=代办工单", sort = 2)
+    @ApiModelProperty(value = "工单类型 1循环 2代办")
+    private Integer type;
+
+    /**
+     * 无合同
+     */
+    @ApiModelProperty(value = "无合同")
+    private Integer noContract;
+
+    /**
+     * 编号
+     */
+    @ApiModelProperty(value = "编号")
+    private String workOrderNo;
+
+    /**
+     * 任务类型 任务表外键 任务明细表
+     */
+    @ApiModelProperty(value = "任务外键")
+    private Long taskTypeId;
+
+    /**
+     * 服务管理查询条件
+     */
+    @Excel(name = "状态", readConverterExp = "0=未开始,1=进行中,3=已完成", sort = 6)
+    @TableField(exist = false)
+    private Integer status;
+
+    @TableField(exist = false)
+    @Excel(name = "项目", sort = 4)
+    private String taskTypeName;
+
+    @TableField(exist = false)
+    @Excel(name = "导出期间", sort = 5)
+    private String period;
+
+    /**
+     * 任务类型 任务表外键 任务明细表
+     */
+    @ApiModelProperty(value = "任务明细外键")
+    private Long taskTypeDetailId;
+
+    @TableField(exist = false)
+    private String taskTypeDetailName;
+
+    /**
+     * 收款截至月
+     */
+    @TableField(exist = false)
+    private String closingMonth;
+
+    /**
+     * 单次合同收款状态
+     */
+    @TableField(exist = false)
+    private String onceContractStatus;
+
+    /**
+     * 开始月
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty(value = "开始月")
+    private Date startMonth;
+
+    /**
+     * 结束月
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty(value = "结束月")
+    private Date endMonth;
+
+    /**
+     * 月数
+     */
+    @ApiModelProperty(value = "月数")
+    private Integer monthNum;
+
+    /**
+     * 负责人
+     */
+    @ApiModelProperty(value = "负责人")
+    private Long managerId;
+
+    /**
+     * 主程序账套外键
+     */
+    @ApiModelProperty(value = "账套外键")
+    private Long tenantId;
+
+    /**
+     * 停止任务
+     */
+    @ApiModelProperty(value = "停止任务")
+    private Integer isStop;
+
+
+    //    @Excel(name = "注册省份编码")
+    @ApiModelProperty(value = "注册省份编码")
+    private String provinceCode;
+
+    /**
+     * 省
+     */
+//    @Excel(name = "省", sort = 11)
+    @ApiModelProperty(value = "省")
+    private String province;
+
+    /**
+     * 注册城市编码
+     */
+//    @Excel(name = "注册城市编码")
+    @ApiModelProperty(value = "注册城市编码")
+    private String cityCode;
+
+    /**
+     * 市
+     */
+//    @Excel(name = "市", sort = 12)
+    @ApiModelProperty(value = "市")
+    private String city;
+
+    /**
+     * 注册行政区编码
+     */
+//    @Excel(name = "注册行政区编码")
+    @ApiModelProperty(value = "注册行政区编码")
+    private String districtCode;
+
+    /**
+     * 区
+     */
+//    @Excel(name = "区", sort = 13)
+    @ApiModelProperty(value = "区")
+    private String district;
+
+    @TableField(exist = false)
+    private List<BizWorkOrderRecord> records;
+    @TableField(exist = false)
+    private List<BizWorkOrderDetail> details;
+
+
+    @TableField(exist = false)
+    private String year;
+    @TableField(exist = false)
+    private String month;
+
+    @ApiModelProperty("服务人员")
+    private Long serviceId;
+
+    @TableField(exist = false)
+    @Excel(name = "执行人", sort = 7)
+    private String serviceName;
+
+    @TableField(exist = false)
+    private List<BizEntrust> entrusts;
+
+    @TableField(exist = false)
+    private BizEntrust entrust;
+
+    @TableField(exist = false)
+    private List<Long> ids;
+
+    @TableField(exist = false)
+    private Integer isZero;
+}

src/main/java/cn/ezhizao/project/business/workOrder/domain/BizWorkOrderNoContract.java

@@ -0,0 +1,207 @@
+package cn.ezhizao.project.business.workOrder.domain;
+
+import cn.ezhizao.framework.aspectj.lang.annotation.Excel;
+import cn.ezhizao.framework.web.domain.BaseEntity;
+import cn.ezhizao.project.business.entrust.domain.BizEntrust;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 工单信息对象 biz_work_order
+ *
+ * @author ruoyi
+ * @date 2023-10-16
+ */
+@Data
+@TableName(value = "biz_work_order")
+public class BizWorkOrderNoContract extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 合同外键
+     */
+    @ApiModelProperty(value = "${comment}")
+    private Long contractId;
+
+    /**
+     * 客户外键
+     */
+    @ApiModelProperty(value = "${comment}")
+    private Long companyId;
+
+    @ApiModelProperty("客户名称")
+    @Excel(name = "客户名称",width = 35)
+    @TableField(exist = false)
+    private String companyName;
+
+    @ApiModelProperty("税号")
+    @TableField(exist = false)
+    private String socialCreditCode;
+
+    @ApiModelProperty("合同明细外键")
+    private Long contractDetailId;
+
+    @ApiModelProperty("合同流程外键")
+    private Long contractDetailProcessId;
+
+    /**
+     * 工单类型 1循环 2代办
+     */
+    @ApiModelProperty(value = "工单类型 1循环 2代办")
+    private Integer type;
+
+    /**
+     * 无合同
+     */
+    @ApiModelProperty(value = "无合同")
+    private Integer noContract;
+
+    /**
+     * 编号
+     */
+    @ApiModelProperty(value = "编号")
+    private String workOrderNo;
+
+    /**
+     * 任务类型 任务表外键 任务明细表
+     */
+    @ApiModelProperty(value = "任务外键")
+    private Long taskTypeId;
+
+    @TableField(exist = false)
+    private String taskTypeName;
+
+    /**
+     * 任务类型 任务表外键 任务明细表
+     */
+    @ApiModelProperty(value = "任务明细外键")
+    private Long taskTypeDetailId;
+
+    @TableField(exist = false)
+    private String taskTypeDetailName;
+
+    /** 备注 */
+    @Excel(name = "服务内容",width = 35)
+    private String remark;
+
+    /**
+     * 收款截至月
+     */
+    @TableField(exist = false)
+    private String closingMonth;
+
+    /**
+     * 单次合同收款状态
+     */
+    @TableField(exist = false)
+    private String onceContractStatus;
+
+    /**
+     * 开始月
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty(value = "开始月")
+    private Date startMonth;
+
+    /**
+     * 结束月
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty(value = "结束月")
+    private Date endMonth;
+
+    /**
+     * 月数
+     */
+    @ApiModelProperty(value = "月数")
+    private Integer monthNum;
+
+    /**
+     * 负责人
+     */
+    @ApiModelProperty(value = "负责人")
+    private Long managerId;
+
+    /**
+     * 主程序账套外键
+     */
+    @ApiModelProperty(value = "账套外键")
+    private Long tenantId;
+
+    /**
+     * 停止任务
+     */
+    @ApiModelProperty(value = "停止任务")
+    private Integer isStop;
+
+
+    @ApiModelProperty(value = "注册省份编码")
+    private String provinceCode;
+
+    /**
+     * 省
+     */
+    @ApiModelProperty(value = "省")
+    private String province;
+
+    /**
+     * 注册城市编码
+     */
+    @ApiModelProperty(value = "注册城市编码")
+    private String cityCode;
+
+    /**
+     * 市
+     */
+    @ApiModelProperty(value = "市")
+    private String city;
+
+    /**
+     * 注册行政区编码
+     */
+    @ApiModelProperty(value = "注册行政区编码")
+    private String districtCode;
+
+    /**
+     * 区
+     */
+    @ApiModelProperty(value = "区")
+    private String district;
+
+    @TableField(exist = false)
+    private List<BizWorkOrderRecord> records;
+    @TableField(exist = false)
+    private List<BizWorkOrderDetail> details;
+
+    /**
+     * 服务管理查询条件
+     */
+    @TableField(exist = false)
+    private Integer status;
+    @TableField(exist = false)
+    private String year;
+    @TableField(exist = false)
+    private String month;
+
+    @ApiModelProperty("服务人员")
+    private Long serviceId;
+
+    @TableField(exist = false)
+    @Excel(name = "执行人")
+    private String serviceName;
+
+    @TableField(exist = false)
+    private List<BizEntrust> entrusts;
+
+    @TableField(exist = false)
+    private List<Long> ids;
+
+    @TableField(exist = false)
+    private Integer isZero;
+}

src/main/java/cn/ezhizao/project/business/workOrder/domain/BizWorkOrderOnce.java

@@ -0,0 +1,241 @@
+package cn.ezhizao.project.business.workOrder.domain;
+
+import cn.ezhizao.framework.aspectj.lang.annotation.Excel;
+import cn.ezhizao.framework.web.domain.BaseEntity;
+import cn.ezhizao.project.business.entrust.domain.BizEntrust;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 工单信息对象 biz_work_order
+ *
+ * @author ruoyi
+ * @date 2023-10-16
+ */
+@Data
+@TableName(value = "biz_work_order")
+public class BizWorkOrderOnce extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 合同外键
+     */
+    @ApiModelProperty(value = "${comment}")
+    private Long contractId;
+
+    /**
+     * 客户外键
+     */
+    @ApiModelProperty(value = "${comment}")
+    private Long companyId;
+
+    @ApiModelProperty("客户名称")
+    @Excel(name = "客户名称",width = 35, sort = 1)
+    @TableField(exist = false)
+    private String companyName;
+
+
+
+    @ApiModelProperty("纳税性质")
+    @TableField(exist = false)
+    private String taxType;
+
+    @Excel(name = "客户名称",width = 25, sort = 2)
+    @ApiModelProperty("税号")
+    @TableField(exist = false)
+    private String socialCreditCode;
+
+    /** 备注 */
+    @Excel(name = "服务内容",width = 25,sort = 3)
+    private String remark;
+
+    @ApiModelProperty("合同明细外键")
+    private Long contractDetailId;
+
+    @ApiModelProperty("合同流程外键")
+    private Long contractDetailProcessId;
+
+    /**
+     * 工单类型 1循环 2代办
+     */
+    @ApiModelProperty(value = "工单类型 1循环 2代办")
+    private Integer type;
+
+    /**
+     * 无合同
+     */
+    @ApiModelProperty(value = "无合同")
+    private Integer noContract;
+
+    /**
+     * 编号
+     */
+    @ApiModelProperty(value = "编号")
+    private String workOrderNo;
+
+    /**
+     * 任务类型 任务表外键 任务明细表
+     */
+    @ApiModelProperty(value = "任务外键")
+    private Long taskTypeId;
+
+    @TableField(exist = false)
+//    @Excel(name = "任务类型", sort = 5)
+    private String taskTypeName;
+
+    /**
+     * 任务类型 任务表外键 任务明细表
+     */
+    @ApiModelProperty(value = "任务明细外键")
+    private Long taskTypeDetailId;
+
+    @TableField(exist = false)
+//    @Excel(name = "任务详情", sort = 6)
+    private String taskTypeDetailName;
+
+    /**
+     * 收款截至月
+     */
+    @TableField(exist = false)
+    private String closingMonth;
+
+    /**
+     * 单次合同收款状态
+     */
+    @TableField(exist = false)
+    private String onceContractStatus;
+
+    /**
+     * 开始月
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty(value = "开始月")
+    private Date startMonth;
+
+    /**
+     * 结束月
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty(value = "结束月")
+    private Date endMonth;
+
+    /**
+     * 月数
+     */
+//    @Excel(name = "月数", sort = 9)
+    @ApiModelProperty(value = "月数")
+    private Integer monthNum;
+
+    /**
+     * 负责人
+     */
+    @ApiModelProperty(value = "负责人")
+    private Long managerId;
+
+    /**
+     * 主程序账套外键
+     */
+    @ApiModelProperty(value = "账套外键")
+    private Long tenantId;
+
+    /**
+     * 停止任务
+     */
+    @Excel(name = "停止",readConverterExp = "0=否,1=是", sort = 6)
+    @ApiModelProperty(value = "停止任务")
+    private Integer isStop;
+
+
+    //    @Excel(name = "注册省份编码")
+    @ApiModelProperty(value = "注册省份编码")
+    private String provinceCode;
+
+    /**
+     * 省
+     */
+//    @Excel(name = "省", sort = 11)
+    @ApiModelProperty(value = "省")
+    private String province;
+
+    /**
+     * 注册城市编码
+     */
+//    @Excel(name = "注册城市编码")
+    @ApiModelProperty(value = "注册城市编码")
+    private String cityCode;
+
+    /**
+     * 市
+     */
+//    @Excel(name = "市", sort = 12)
+    @ApiModelProperty(value = "市")
+    private String city;
+
+    /**
+     * 注册行政区编码
+     */
+//    @Excel(name = "注册行政区编码")
+    @ApiModelProperty(value = "注册行政区编码")
+    private String districtCode;
+
+    /**
+     * 区
+     */
+//    @Excel(name = "区", sort = 13)
+    @ApiModelProperty(value = "区")
+    private String district;
+
+    @TableField(exist = false)
+    private List<BizWorkOrderRecord> records;
+    @TableField(exist = false)
+    private List<BizWorkOrderDetail> details;
+
+    @TableField(exist = false)
+    private BizWorkOrderRecord record;
+
+    /**
+     * 服务管理查询条件
+     */
+    @Excel(name = "状态",readConverterExp = "0=未开始,1=进行中,3=已完成", sort = 4)
+    @TableField(exist = false)
+    private Integer status;
+    @TableField(exist = false)
+    private String year;
+    @TableField(exist = false)
+    private String month;
+
+    @ApiModelProperty("服务人员")
+    private Long serviceId;
+
+    @TableField(exist = false)
+    @Excel(name = "执行人", sort = 5)
+    private String serviceName;
+
+    @TableField(exist = false)
+    private List<BizEntrust> entrusts;
+
+    @TableField(exist = false)
+    private BizEntrust entrust;
+
+    @TableField(exist = false)
+    private List<Long> ids;
+
+    @TableField(exist = false)
+    private Integer isZero;
+
+    public String getRemark()
+    {
+        return remark;
+    }
+
+    public void setRemark(String remark)
+    {
+        this.remark = remark;
+    }
+}

src/main/resources/mybatis/business/BizWorkOrderMapper.xml

@@ -17,7 +17,7 @@
 
     <select id="getList" parameterType="BizWorkOrder" resultMap="BizWorkOrderResult">
         SELECT t1.*, t2.name as company_name, t2.social_credit_code, t3.name as task_type_name, t4.name as
-        task_type_detail_name, t5.nick_name as service_name, t2.is_zero
+        task_type_detail_name, t5.nick_name as service_name, t2.is_zero,t2.tax_type
         FROM biz_work_order t1
         left join biz_company t2 on t2.id = t1.company_id
         left join biz_task_type t3 on t3.id = t1.task_type_id