提交

src/main/java/cn/ezhizao/project/business/deduction/controller/DeductionController.java

@@ -24,6 +24,7 @@ import cn.ezhizao.project.system.domain.SysFileStorage;
 import cn.ezhizao.project.system.service.ISysFileStorageService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
@@ -65,6 +66,7 @@ public class DeductionController extends BaseController {
     IBizFinancialMergeService bizFinancialMergeService;
 
     @ApiOperation(value = "根据id查询", notes = "根据id查询")
+    @PreAuthorize("@ss.hasPermi('business:deduction:query')")
     @GetMapping("/getById/{id}")
     @ResponseBody
     public AjaxResult getById(@PathVariable Long id) {
@@ -73,6 +75,7 @@ public class DeductionController extends BaseController {
 
     @PostMapping("/save")
     @ApiOperation(value = "保存", notes = "保存")
+    @PreAuthorize("@ss.hasPermi('business:deduction:confirm，business:deduction:deduction')")
     @ResponseBody
     @Transactional(rollbackFor = Exception.class)
     public AjaxResult save(@RequestBody BizDeduction deduction) {
@@ -117,11 +120,13 @@ public class DeductionController extends BaseController {
     }
 
     @ApiOperation(value = "带条件List 分页查询", notes = "带条件List 分页查询")
+    @PreAuthorize("@ss.hasPermi('business:deduction:list')")
     @GetMapping("/list")
     @ResponseBody
     public TableDataInfo getList(BizDeduction conditions) throws NoSuchFieldException, IllegalAccessException {
         setTenantId(conditions);
         startPage();
+        startOrderBy();
         List<BizDeduction> list = deductionService.getListByBean(conditions);
         //分页数据
         return getDataTable(list);

src/main/java/cn/ezhizao/project/business/deduction/domain/BizDeduction.java

@@ -69,6 +69,7 @@ public class BizDeduction extends BaseEntity implements Serializable {
     private String operationName;
 
     @ApiModelProperty(value = "操作时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Timestamp operationDate;
 
     @ApiModelProperty(value = "主程序账套外键")

src/main/java/cn/ezhizao/project/business/finance/IndividualIncomeTax/controller/BizFinancialIndividualIncomeTaxDetailController.java

@@ -126,11 +126,10 @@ public class BizFinancialIndividualIncomeTaxDetailController extends BaseControl
         return success(biz);
     }
 
-    /**
-     *
-     */
+
     @PreAuthorize("@ss.hasPermi('business:individualIncomeTaxDetail:saveDetail')")
     @ApiOperation("保存detail")
+    @Log(title = "个税详情", businessType = BusinessType.UPDATE)
     @PostMapping()
     @Transactional(rollbackFor = Exception.class)
     public AjaxResult saveDetail(@RequestBody BizFinancialIndividualIncomeTaxDetail bizFinancialIndividualIncomeTaxDetail) throws NoSuchFieldException, IllegalAccessException
@@ -158,10 +157,6 @@ public class BizFinancialIndividualIncomeTaxDetailController extends BaseControl
         delConditions.setMasterId(bizFinancialIndividualIncomeTaxDetail.getId());
         delConditions.setMasterTableName("biz_financial_individual_income_tax_detail");
         fileStorageService.physicalDelete(delConditions);
-
-//        Map<String, Object> delCondition = new HashMap<>();
-//        delCondition.put("financialIndividualIncomeTaxDetailId", bizFinancialIndividualIncomeTaxDetail.getId());
-//        int a=bizFinancialMergeService.physicallyDelete(delCondition);
         bool = bool && (fileStorages.isEmpty() || fileStorageService.saveOrUpdateBatch(fileStorages));
         return toAjax(addRecord(bizFinancialIndividualIncomeTaxDetail.getFinancialIndividualIncomeTaxId(),
                 bizFinancialIndividualIncomeTaxDetail.getYear(),bizFinancialIndividualIncomeTaxDetail.getMonth(), SecurityUtils.getUserId(),status)&&bool);
@@ -169,31 +164,6 @@ public class BizFinancialIndividualIncomeTaxDetailController extends BaseControl
 
 
 
-    /**
-     * 修改个税详情
-     */
-    @PreAuthorize("@ss.hasPermi('business:individualIncomeTaxDetail:edit')")
-    @Log(title = "个税详情", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody BizFinancialIndividualIncomeTaxDetail bizFinancialIndividualIncomeTaxDetail) throws NoSuchFieldException, IllegalAccessException
-    {
-
-        String status = "";
-        switch (bizFinancialIndividualIncomeTaxDetail.getStatus()) {
-            case 0:
-                status = "个税未开始";
-                break;
-            case 1:
-                status = "个税进行中";
-                break;
-            case 3:
-                status = "个税已完成";
-                break;
-        }
-        return toAjax(bizFinancialIndividualIncomeTaxDetailService.updateById(bizFinancialIndividualIncomeTaxDetail)&&addRecord(bizFinancialIndividualIncomeTaxDetail.getFinancialIndividualIncomeTaxId(),
-                bizFinancialIndividualIncomeTaxDetail.getYear(),bizFinancialIndividualIncomeTaxDetail.getMonth(), SecurityUtils.getUserId(),status));
-    }
-
     private Boolean checkDeduction(BizFinancialIndividualIncomeTaxDetail detail) {
         // 判断当前月是否报税
         // 20230915 假设未报税也插入一条税款，合并税款记录中的是否可扣款未0

src/main/java/cn/ezhizao/project/business/finance/IndividualIncomeTaxIsZero/domain/BizFinancialIndividualIncomeTaxIsZero.java

@@ -2,6 +2,7 @@ package cn.ezhizao.project.business.finance.IndividualIncomeTaxIsZero.domain;
 
 import java.io.Serializable;
 
+import cn.ezhizao.framework.aspectj.lang.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import cn.ezhizao.framework.web.domain.BaseEntity;
@@ -23,6 +24,7 @@ public class BizFinancialIndividualIncomeTaxIsZero extends BaseEntity implements
     private Long companyId;
 
     @ApiModelProperty(value = "客户")
+    @Excel(name = "客户")
     @TableField(exist = false)
     private String companyName;
 

src/main/java/cn/ezhizao/project/business/housingFund/controller/BizHousingFundConfirmController.java

@@ -114,6 +114,7 @@ public class BizHousingFundConfirmController extends BaseController {
     public TableDataInfo getList(BizHousingFundConfirm conditions) throws NoSuchFieldException, IllegalAccessException {
         setTenantId(conditions);
         startPage();
+        startOrderBy();
         List<BizHousingFundConfirm> list = housingFundConfirmService.getListByBean(conditions);
         if (!list.isEmpty()) {
             Map<String, Object> detailConditions = new HashMap<>();

src/main/java/cn/ezhizao/project/business/housingFund/controller/BizHousingFundDeclareController.java

@@ -95,11 +95,13 @@ public class BizHousingFundDeclareController extends BaseController {
     }
 
     @ApiOperation(value = "带条件List 分页查询", notes = "带条件List 分页查询")
+    @PreAuthorize("@ss.hasPermi('business:housingFundDeclare:list')")
     @GetMapping("/list")
     @ResponseBody
     public TableDataInfo getList(BizHousingFundDeclare conditions) throws NoSuchFieldException, IllegalAccessException {
        setTenantId(conditions);
         startPage();
+        startOrderBy();
         List<BizHousingFundDeclare> list = housingFundDeclareService.getListByBean(conditions);
         if (!list.isEmpty()) {
             BizHousingFundDeclareDetail detailConditions = new BizHousingFundDeclareDetail();
@@ -148,7 +150,7 @@ public class BizHousingFundDeclareController extends BaseController {
         return bool ? success(fileStorage) : error();
     }
 
-    @PreAuthorize("@ss.hasPermi('business:housingFundDeclare:query')")
+    @PreAuthorize("@ss.hasPermi('business:housingFundDeclare:query，business:housingFundDeclare:verify')")
     @PostMapping("/getDetail")
     public AjaxResult getDetail(@RequestBody BizHousingFundDeclareDetail condition) {
         List<BizHousingFundDeclareDetail> housingFundDeclareDetails = housingFundDeclareDetailService.getListByBean(condition);
@@ -177,6 +179,7 @@ public class BizHousingFundDeclareController extends BaseController {
 
     @ApiOperation("保存detail")
     @PostMapping("/saveDetail")
+    @PreAuthorize("@ss.hasPermi('business:housingFundDeclare:edit')")
     @ResponseBody
     public AjaxResult saveDetail(@RequestBody BizHousingFundDeclareDetail detail) {
         boolean bool = housingFundDeclareDetailService.saveOrUpdate(detail);
@@ -196,6 +199,7 @@ public class BizHousingFundDeclareController extends BaseController {
 
     @ApiOperation("审核")
     @PostMapping("/verify")
+    @PreAuthorize("@ss.hasPermi('business:housingFundDeclare:verify')")
     @Transactional(rollbackFor = Exception.class)
     @ResponseBody
     public AjaxResult verify(@RequestBody BizHousingFundDeclareDetail detail) {

src/main/java/cn/ezhizao/project/business/keepAccounts/controller/BizFinancialKeepAccountController.java

@@ -2,6 +2,7 @@ package cn.ezhizao.project.business.keepAccounts.controller;
 
 import cn.ezhizao.common.exception.ServiceException;
 import cn.ezhizao.common.utils.SecurityUtils;
+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;
@@ -20,10 +21,12 @@ import cn.ezhizao.project.business.workOrder.service.IBizWorkOrderRecordService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.java.Log;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 import reactor.util.annotation.Nullable;
+import cn.ezhizao.framework.aspectj.lang.enums.BusinessType;
 
 import javax.annotation.Resource;
 import javax.sql.rowset.serial.SerialException;
@@ -56,7 +59,6 @@ public class BizFinancialKeepAccountController extends BaseController {
     @ResponseBody
     public AjaxResult getById(@PathVariable Long id) {
         AjaxResult result;
-//        Map<String, Object> map = new HashMap<>(16);
         try {
             BizFinancialKeepAccount BizFinancialKeepAccount = financialKeepAccountService.getById(id);
             result = success(BizFinancialKeepAccount);
@@ -93,7 +95,7 @@ public class BizFinancialKeepAccountController extends BaseController {
         return success(map);
     }
 
-    @PreAuthorize("@ss.hasPermi('business:keepAccount:query')")
+    @PreAuthorize("@ss.hasPermi('business:keepAccount:query,business:keepAccount:view')")
     @PostMapping("/getDetail")
     public AjaxResult getDetail(@RequestBody BizFinancialKeepAccountDetail detail) {
         List<BizFinancialKeepAccountDetail> keepAccountDetails = financialKeepAccountDetailService.getList(detail);
@@ -112,6 +114,7 @@ public class BizFinancialKeepAccountController extends BaseController {
 
     @ApiOperation(value = "带条件List 分页查询", notes = "带条件List 分页查询")
     @GetMapping("/list")
+    @PreAuthorize("@ss.hasPermi('business:keepAccount:list')")
     @ResponseBody
     public TableDataInfo getList(BizFinancialKeepAccount conditions) throws NoSuchFieldException, IllegalAccessException {
         setTenantId(conditions);

src/main/java/cn/ezhizao/project/business/keepAccounts/domain/BizFinancialKeepAccount.java

@@ -75,4 +75,7 @@ public class BizFinancialKeepAccount extends BaseEntity {
     @ApiModelProperty(value = "是否零申报")
     @TableField(exist = false)
     private Integer isZero;
+    @ApiModelProperty(value = "是否停止")
+    @TableField(exist = false)
+    private Integer isStop;
 }

src/main/java/cn/ezhizao/project/business/productionCompany/controller/BizProductionCompanyController.java

@@ -41,23 +41,10 @@ public class BizProductionCompanyController extends BaseController
 {
     @Resource
     private IBizProductionCompanyService bizCompanyService;
-//    @Resource
-//    private ISysUserService sysUserService;
-//    @Resource
-//    private IBizChannelService bizChannelService;
-//    @Resource
-//    private IBizCompanyContactorService bizCompanyContactorService;
-
-//    @Resource
-//    private IDictRegionService dictRegionService;
-
-//    @Resource
-//    private IBizCompanyFollowDetailService companyFollowDetailService;
-
+    
     /**
      * 查询company列表
      */
-    @PreAuthorize("@ss.hasPermi('business:company:list')")
     @GetMapping("/list")
     public TableDataInfo list(BizProductionCompany bizCompany) throws NoSuchFieldException, IllegalAccessException
     {
@@ -68,156 +55,4 @@ public class BizProductionCompanyController extends BaseController
         return getDataTable(list);
     }
 
-    /**
-     * 导出company列表
-     */
-    @PreAuthorize("@ss.hasPermi('business:company:export')")
-    @Log(title = "company", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, BizProductionCompany bizCompany) throws NoSuchFieldException, IllegalAccessException
-    {
-        setTenantId(bizCompany);
-        List<BizProductionCompany> list = bizCompanyService.getList(bizCompany);
-        ExcelUtil<BizProductionCompany> util = new ExcelUtil<BizProductionCompany>(BizProductionCompany.class);
-        if (bizCompany.getColumns() != null && !bizCompany.getColumns().isEmpty()) {
-            util.exportExcel(response, list, "company数据", "客户信息导出", bizCompany.getColumns().toArray(new String[0]));
-        } else {
-            util.exportExcel(response, list, "company数据", "客户信息导出");
-        }
-    }
-
-    @Log(title = "客户管理", businessType = BusinessType.IMPORT)
-    @PreAuthorize("@ss.hasPermi('system:company:import')")
-    @PostMapping("/importData")
-    public AjaxResult importData(MultipartFile file) throws Exception
-    {
-        ExcelUtil<BizProductionCompany> util = new ExcelUtil<>(BizProductionCompany.class);
-        List<BizProductionCompany> companyList = util.importExcel(file.getInputStream());
-        String operName = getUsername();
-        String message = bizCompanyService.importCompany(companyList, operName, getTenantId() == null ? 0 : getTenantId());
-        return success(message);
-    }
-
-//    /**
-//     * 获取company详细信息
-//     */
-//    @PreAuthorize("@ss.hasPermi('business:company:query')")
-//    @GetMapping(value = "/{id}")
-//    public AjaxResult getInfo(@PathVariable("id") Long id)
-//    {
-//        BizCompany bizCompany = new BizCompany();
-//        bizCompany.setId(id);
-//        List<BizCompany> bizCompanyList = bizCompanyService.getList(bizCompany);
-//        bizCompany = bizCompanyList.size() > 0 ? bizCompanyList.get(0) : null;
-//        if(bizCompany != null && bizCompany.getReferrerDataSource() != null) {
-//            switch (bizCompany.getReferrerDataSource()) {
-//                case "company":
-//                    BizCompany source = bizCompanyService.getById(bizCompany.getSourceId());
-//                    bizCompany.setSourceName(source != null ? source.getName() : "");
-//                    break;
-//                case "employee":
-//                    SysUser sysUser = sysUserService.selectUserById(bizCompany.getSourceId());
-//                    bizCompany.setSourceName(sysUser != null ? sysUser.getNickName() : "");
-//                    break;
-//                case "channel":
-//                    BizChannel channel = bizChannelService.getById(bizCompany.getSourceId());
-//                    bizCompany.setSourceName(channel != null ? channel.getName() : "");
-//                    break;
-//                default:
-//                    break;
-//            }
-//        }
-//        if (bizCompany != null) {
-//            BizCompanyContactor condition = new BizCompanyContactor();
-//            condition.setCompanyId(bizCompany.getId());
-//            bizCompany.setContactors(bizCompanyContactorService.getList(condition));
-//            BizCompanyFollowDetail followDetail = new BizCompanyFollowDetail();
-//            followDetail.setCompanyId(bizCompany.getId());
-//            List<BizCompanyFollowDetail> followDetails = companyFollowDetailService.getList(followDetail);
-//            bizCompany.setFollowDetails(followDetails);
-//        }
-//        return success(bizCompany);
-//    }
-
-//    /**
-//     * 新增company
-//     */
-//    @PreAuthorize("@ss.hasPermi('business:company:add')")
-//    @Log(title = "company", businessType = BusinessType.INSERT)
-//    @PostMapping
-//    public AjaxResult add(@RequestBody BizCompany bizCompany) throws NoSuchFieldException, IllegalAccessException
-//    {
-//        setTenantId(bizCompany);
-//
-//        return bizCompanyService.save(bizCompany) ? success("保存成功", bizCompany)  : error("保存失败");
-//    }
-
-//    /**
-//     * 修改company
-//     */
-//    @PreAuthorize("@ss.hasPermi('business:company:edit')")
-//    @Log(title = "company", businessType = BusinessType.UPDATE)
-//    @PutMapping
-//    public AjaxResult edit(@RequestBody BizCompany bizCompany) throws NoSuchFieldException, IllegalAccessException
-//    {
-//        setTenantId(bizCompany);
-//        return bizCompanyService.updateById(bizCompany) ? success("保存成功", bizCompany) : error("保存失败");
-//    }
-
-    /**
-     * 删除company
-     */
-    @PreAuthorize("@ss.hasPermi('business:company:remove')")
-    @Log(title = "company", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable List<Long> ids)
-    {
-        return toAjax(bizCompanyService.removeBatchByIds(ids));
-    }
-
-    /**
-     * 导出初始化客户模板
-     * @param response
-     */
-    @PostMapping("/importTemplate")
-    public void importTemplate(HttpServletResponse response)
-    {
-        ExcelUtil<BizCompany> util = new ExcelUtil<>(BizCompany.class);
-        util.importTemplateExcel(response, "客户数据", StringUtils.EMPTY, new String[]{"name", "sourceCategoryName", "sourceName"});
-    }
-
-    @PostMapping("/setCompanyAdviser")
-    @PreAuthorize("@ss.hasPermi('business:company:edit')")
-    @Log(title = "company", businessType = BusinessType.UPDATE)
-    public AjaxResult setCompanyAdviser(@RequestBody BizProductionCompany company) {
-        List<Long> ids = company.getIds();
-        Long adviserId = company.getAdviserId();
-        BizProductionCompany conditions = new BizProductionCompany();
-        conditions.setIds(ids);
-        List<BizProductionCompany> companies = bizCompanyService.getList(conditions);
-        companies.forEach(l -> l.setAdviserId(adviserId));
-        return toAjax(bizCompanyService.updateBatchById(companies));
-    }
-
-    @PostMapping("/setCompanyLeader")
-    @PreAuthorize("@ss.hasPermi('business:company:edit')")
-    @Log(title = "company", businessType = BusinessType.UPDATE)
-    public AjaxResult setCompanyLeader(@RequestBody BizProductionCompany company) {
-        List<Long> ids = company.getIds();
-        Long leaderId = company.getLeaderId();
-        BizProductionCompany conditions = new BizProductionCompany();
-        conditions.setIds(ids);
-        List<BizProductionCompany> companies = bizCompanyService.getList(conditions);
-        companies.forEach(l -> l.setLeaderId(leaderId));
-        return toAjax(bizCompanyService.updateBatchById(companies));
-    }
-//
-//    @GetMapping(value = "/initArea")
-//    @PreAuthorize("@ss.hasPermi('business:company:list')")
-//    public AjaxResult initArea()  throws IOException {
-//        List<DictRegion> regions = JSONArray.parseArray(IOUtils.toString(BizCompanyServiceImpl.class.getResourceAsStream("/company/region.json"), Charset.forName("UTF-8")), DictRegion.class);
-//        return toAjax(dictRegionService.saveBatch(regions));
-//    }
-
-
 }

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

@@ -90,7 +90,7 @@ public class BizFinancialReceiveTicketController extends BaseController
         }
         return getDataTable(list);
     }
-    @PreAuthorize("@ss.hasPermi('business:receiveTicket:query')")
+    @PreAuthorize("@ss.hasPermi('business:receiveTicket:query,business:receiveTicket:view')")
     @PostMapping("/getDetail")
     public AjaxResult getDetail(@RequestBody BizFinancialReceiveTicketDetail details) {
         List<BizFinancialReceiveTicketDetail> bizFinancialSalaryDetails = financialReceiveTicketDetailService.getList(details);
@@ -102,7 +102,7 @@ public class BizFinancialReceiveTicketController extends BaseController
 
     @ApiOperation("根据客户id和当前年月获取当前工资信息")
     @PostMapping("/getSalaryDetail")
-    @PreAuthorize("@ss.hasPermi('business:receiveTicket:query')")
+    @PreAuthorize("@ss.hasPermi('business:receiveTicket:query,business:receiveTicket:view')")
     @ResponseBody
     public AjaxResult getSalaryDetailByCondition(@RequestBody BizFinancialSalaryDetail conditions) {
         BizFinancialSalaryDetail detail = financialSalaryDetailService.getList(conditions).stream().findFirst().orElse(null);
@@ -312,6 +312,7 @@ public class BizFinancialReceiveTicketController extends BaseController
         if (financialSalaryDetail != null) {
             QueryWrapper<BizFinancialKeepAccount> qw = new QueryWrapper<>();
             qw.eq("company_id", detail.getCompanyId());
+            qw.eq("is_stop", 0);
             BizFinancialKeepAccount financialKeepAccount = financialKeepAccountService.getOne(qw);
             if (financialKeepAccount != null) {
                 QueryWrapper<BizFinancialKeepAccountDetail> kqw = new QueryWrapper<>();

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

@@ -39,7 +39,7 @@ public class BizFinancialReceiveTicketFeedbackController extends BaseController
     /**
      * 查询收票反馈列表
      */
-    @PreAuthorize("@ss.hasPermi('business:receiveTicketFeedback:list')")
+    @PreAuthorize("@ss.hasPermi('business:archiveReceiveTicket:list')")
     @GetMapping("/list")
     public TableDataInfo list(BizFinancialReceiveTicketFeedback bizFinancialReceiveTicketFeedback) throws NoSuchFieldException, IllegalAccessException
     {
@@ -53,7 +53,7 @@ public class BizFinancialReceiveTicketFeedbackController extends BaseController
     /**
      * 导出收票反馈列表
      */
-    @PreAuthorize("@ss.hasPermi('business:receiveTicketFeedback:export')")
+    @PreAuthorize("@ss.hasPermi('business:archiveReceiveTicket:export')")
     @Log(title = "收票反馈", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, BizFinancialReceiveTicketFeedback bizFinancialReceiveTicketFeedback) throws NoSuchFieldException, IllegalAccessException
@@ -67,7 +67,7 @@ public class BizFinancialReceiveTicketFeedbackController extends BaseController
     /**
      * 获取收票反馈详细信息
      */
-    @PreAuthorize("@ss.hasPermi('business:receiveTicketFeedback:query')")
+    @PreAuthorize("@ss.hasPermi('business:archiveReceiveTicket:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -77,7 +77,7 @@ public class BizFinancialReceiveTicketFeedbackController extends BaseController
     /**
      * 新增收票反馈
      */
-    @PreAuthorize("@ss.hasPermi('business:receiveTicketFeedback:add')")
+    @PreAuthorize("@ss.hasPermi('business:archiveReceiveTicket:add')")
     @Log(title = "收票反馈", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody BizFinancialReceiveTicketFeedback bizFinancialReceiveTicketFeedback) throws NoSuchFieldException, IllegalAccessException
@@ -89,7 +89,7 @@ public class BizFinancialReceiveTicketFeedbackController extends BaseController
     /**
      * 修改收票反馈
      */
-    @PreAuthorize("@ss.hasPermi('business:receiveTicketFeedback:edit')")
+    @PreAuthorize("@ss.hasPermi('business:archiveReceiveTicket:edit')")
     @Log(title = "收票反馈", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody BizFinancialReceiveTicketFeedback bizFinancialReceiveTicketFeedback) throws NoSuchFieldException, IllegalAccessException
@@ -102,7 +102,7 @@ public class BizFinancialReceiveTicketFeedbackController extends BaseController
     /**
      * 删除收票反馈
      */
-    @PreAuthorize("@ss.hasPermi('business:receiveTicketFeedback:remove')")
+    @PreAuthorize("@ss.hasPermi('business:archiveReceiveTicket:remove')")
     @Log(title = "收票反馈", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable List<Long> ids)

src/main/java/cn/ezhizao/project/business/reportTaxIsZero/controller/BizFinancialReportTaxController.java

@@ -146,10 +146,6 @@ public class BizFinancialReportTaxController extends BaseController {
         startPage();
         List<BizFinancialReportTax> list = financialReportTaxService.getList(financialReportTax);
         if (!list.isEmpty()) {
-//            Map<String, Object> detailConditions = new HashMap<>();
-//            detailConditions.put("year", conditions.getOrDefault("year", DateTime.now().year()));
-//            detailConditions.put("mainIds", list.stream().map(FinancialReportTax::getId).collect(Collectors.toList()));
-//            detailConditions.put("month", conditions.getOrDefault("month", DateTime.now().month()));
             BizFinancialReportTaxDetail detailConditions = new BizFinancialReportTaxDetail();
             detailConditions.setMainIds(list.stream().map(BizFinancialReportTax::getId).collect(Collectors.toList()));
             detailConditions.setYear(financialReportTax.getYear());

src/main/java/cn/ezhizao/project/business/salary/controller/BizFinancialSalaryController.java

@@ -150,7 +150,7 @@ public class BizFinancialSalaryController extends BaseController {
         return toAjax(bizFinancialSalaryService.removeBatchByIds(ids));
     }
 
-    @PreAuthorize("@ss.hasPermi('business:salary:query')")
+    @PreAuthorize("@ss.hasPermi('business:salary:query,business:salary:view')")
     @PostMapping("/getDetail")
     public AjaxResult getDetail(@RequestBody BizFinancialSalaryDetail bizFinancialSalaryDetail) {
         List<BizFinancialSalaryDetail> bizFinancialSalaryDetails = bizFinancialSalaryDetailService.getList(bizFinancialSalaryDetail);
@@ -254,6 +254,7 @@ public class BizFinancialSalaryController extends BaseController {
         if (financialReceiveTicketDetail != null) {
             QueryWrapper<BizFinancialKeepAccount> qw = new QueryWrapper<>();
             qw.eq("company_id", detail.getCompanyId());
+            qw.eq("is_stop", 0);
             BizFinancialKeepAccount BizFinancialKeepAccount = financialKeepAccountService.getOne(qw);
             if (BizFinancialKeepAccount != null) {
                 QueryWrapper<BizFinancialKeepAccountDetail> kqw = new QueryWrapper<>();

src/main/java/cn/ezhizao/project/business/salary/controller/BizFinancialSalaryZeroController.java

@@ -125,7 +125,7 @@ public class BizFinancialSalaryZeroController extends BaseController {
     /**
      * 修改工资
      */
-    @PreAuthorize("@ss.hasPermi('business:salary:edit')")
+    @PreAuthorize("@ss.hasPermi('business:salaryZero:edit')")
     @Log(title = "工资", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody BizFinancialSalary bizFinancialSalary) throws NoSuchFieldException, IllegalAccessException {
@@ -143,7 +143,7 @@ public class BizFinancialSalaryZeroController extends BaseController {
         return toAjax(bizFinancialSalaryService.removeBatchByIds(ids));
     }
 
-    @PreAuthorize("@ss.hasPermi('business:salary:query')")
+    @PreAuthorize("@ss.hasPermi('business:salaryZero:query,business:salaryZero:edit,business:salaryZero:view')")
     @PostMapping("/getDetail")
     public AjaxResult getDetail(@RequestBody BizFinancialSalaryDetail bizFinancialSalaryDetail) {
         List<BizFinancialSalaryDetail> bizFinancialSalaryDetails = bizFinancialSalaryDetailService.getList(bizFinancialSalaryDetail);
@@ -185,7 +185,7 @@ public class BizFinancialSalaryZeroController extends BaseController {
         return toAjax(bizFinancialSalaryDetailService.updateById(bizFinancialSalaryDetail) && addRecord(bizFinancialSalaryDetail.getFinancialSalaryId(), bizFinancialSalaryDetail.getYear(), bizFinancialSalaryDetail.getMonth(), SecurityUtils.getUserId(), "修改工资信息"));
     }
 
-    @PreAuthorize("@ss.hasPermi('business:salary:verify')")
+    @PreAuthorize("@ss.hasPermi('business:salaryZero:verify')")
     @PostMapping("/verifyDetail")
     @Transactional(rollbackFor = Exception.class)
     public AjaxResult verifyDetail(@RequestBody BizFinancialSalaryDetail bizFinancialSalaryDetail) {

src/main/java/cn/ezhizao/project/business/socialSecurity/controller/SocialSecurityConfirmController.java

@@ -55,7 +55,7 @@ public class SocialSecurityConfirmController extends BaseController {
     }
 
 
-    @PreAuthorize("@ss.hasPermi('business:socialSecurityConfirm:query')")
+    @PreAuthorize("@ss.hasPermi('business:socialSecurityConfirm:query，business:socialSecurityConfirm:view')")
     @PostMapping("/getDetail")
     public AjaxResult getDetail(@RequestBody BizSocialSecurityConfirmDetail condition) {
         List<BizSocialSecurityConfirmDetail> socialSecurityConfirmDetails = socialSecurityConfirmDetailService.getListByBean(condition);

src/main/java/cn/ezhizao/project/business/socialSecurity/controller/SocialSecurityDeclareController.java

@@ -91,12 +91,13 @@ public class SocialSecurityDeclareController extends BaseController {
     }
 
     @ApiOperation(value = "带条件List 分页查询", notes = "带条件List 分页查询")
-    @PreAuthorize("@ss.hasPermi('business:socialSecurityDeclare:query')")
+    @PreAuthorize("@ss.hasPermi('business:socialSecurityDeclare:list')")
     @GetMapping("/list")
     @ResponseBody
     public TableDataInfo getList(BizSocialSecurityDeclare conditions) throws NoSuchFieldException, IllegalAccessException {
         setTenantId(conditions);
         startPage();
+        startOrderBy();
         List<BizSocialSecurityDeclare> list = socialSecurityDeclareService.getListByBean(conditions);
         if (!list.isEmpty()) {
             BizSocialSecurityDeclareDetail detailConditions = new BizSocialSecurityDeclareDetail();

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

@@ -41,6 +41,7 @@ public class OnceWorkOrderProductionController extends BaseController {
     public TableDataInfo getList(BizWorkOrder conditions) throws NoSuchFieldException, IllegalAccessException {
         setTenantId(conditions);
         startPage();
+        startOrderBy();
         List<BizWorkOrder> list = workOrderService.getList(conditions);
 //        .stream().filter(s -> s.getCompanyName().contains(companyName)).collect(Collectors.toList())
         return getDataTable(list);

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

@@ -33,6 +33,11 @@ public class BizWorkOrderDetail extends BaseEntity
     @ApiModelProperty("合同明细外键")
     private Long contractDetailId;
 
+    /** 任务外键 */
+    @ApiModelProperty(value = "${comment}")
+    private Long taskTypeId;
+
+
     /** 购买月数 */
     @Excel(name = "购买月数")
     @ApiModelProperty(value = "购买月数")

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

@@ -6,8 +6,8 @@
         <id column="id" jdbcType="BIGINT" property="id"/>
         <result column="id" jdbcType="BIGINT" property="id"/>
         <result column="company_id" jdbcType="BIGINT" property="companyId"/>
-    </resultMap>
 
+    </resultMap>
 
     <!--带条件的List查询-->
     <select id="getList" resultMap="BaseResultMap">