diff --git a/jwtech-quartz/src/main/java/com/jwtech/quartz/task/evaluateTask.java b/jwtech-quartz/src/main/java/com/jwtech/quartz/task/evaluateTask.java index 783ca78d..a7030757 100644 --- a/jwtech-quartz/src/main/java/com/jwtech/quartz/task/evaluateTask.java +++ b/jwtech-quartz/src/main/java/com/jwtech/quartz/task/evaluateTask.java @@ -182,8 +182,8 @@ public class evaluateTask { LocalDate approvalTime = approvalTime1.toInstant().atZone(ZoneId.systemDefault()).toLocalDate(); int month = approvalTime.getMonthValue(); int year = approvalTime.getYear(); - for (int i=0;i4) { + BsSgcJsjdBuiLegalEvaluate legalEvaluate = new BsSgcJsjdBuiLegalEvaluate(); + legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i+1); + legalEvaluate.setLegalPerson(one.getProjectUnitLegal()); + legalEvaluate.setProNo(one.getProNo()); + legalEvaluate.setProCode(one.getProCode()); + legalEvaluate.setCycle(dayOfYear + "-" + 1 + "至" + dayOfYear + "-" + 3); + BsSgcjsjdBuiProInfo byId = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); + if (ObjectUtil.isEmpty(byId)){ + legalEvaluate.setEvaluateStatus("0"); + } + bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i+2); legalEvaluate.setCycle(dayOfYear + "-" + 4 + "至" + dayOfYear + "-" + 6); BsSgcjsjdBuiProInfo byId1 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); @@ -304,29 +316,18 @@ public class evaluateTask { legalEvaluate.setEvaluateStatus("0"); } bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); - - legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i+3); - legalEvaluate.setCycle(dayOfYear + "-" + 7 + "至" + dayOfYear + "-" + 9); - BsSgcjsjdBuiProInfo byId2 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); - if (ObjectUtil.isEmpty(byId2)){ - legalEvaluate.setEvaluateStatus("0"); - } - bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); - - legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i+4); - legalEvaluate.setCycle(dayOfYear + "-" + 10 + "至" + dayOfYear + "-" + 12); - BsSgcjsjdBuiProInfo byId3 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); - if (ObjectUtil.isEmpty(byId3)){ - legalEvaluate.setEvaluateStatus("0"); - } - bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); - - - } else if (monthValue<=6&&monthValue>4) { + } else if (monthValue<=9&&monthValue>6) { BsSgcJsjdBuiLegalEvaluate legalEvaluate = new BsSgcJsjdBuiLegalEvaluate(); + legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i+1); legalEvaluate.setLegalPerson(one.getProjectUnitLegal()); legalEvaluate.setProNo(one.getProNo()); legalEvaluate.setProCode(one.getProCode()); + legalEvaluate.setCycle(dayOfYear + "-" + 1 + "至" + dayOfYear + "-" + 3); + BsSgcjsjdBuiProInfo byId = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); + if (ObjectUtil.isEmpty(byId)){ + legalEvaluate.setEvaluateStatus("0"); + } + bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i+2); legalEvaluate.setCycle(dayOfYear + "-" + 4 + "至" + dayOfYear + "-" + 6); BsSgcjsjdBuiProInfo byId1 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); @@ -334,7 +335,6 @@ public class evaluateTask { legalEvaluate.setEvaluateStatus("0"); } bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); - legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i+3); legalEvaluate.setCycle(dayOfYear + "-" + 7 + "至" + dayOfYear + "-" + 9); BsSgcjsjdBuiProInfo byId2 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); @@ -342,19 +342,25 @@ public class evaluateTask { legalEvaluate.setEvaluateStatus("0"); } bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); - - legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i+4); - legalEvaluate.setCycle(dayOfYear + "-" + 9 + "至" + dayOfYear + "-" + 12); - BsSgcjsjdBuiProInfo byId3 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); - if (ObjectUtil.isEmpty(byId3)){ - legalEvaluate.setEvaluateStatus("0"); - } - bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); - } else if (monthValue<=9&&monthValue>6) { + }else { BsSgcJsjdBuiLegalEvaluate legalEvaluate = new BsSgcJsjdBuiLegalEvaluate(); + legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i+1); legalEvaluate.setLegalPerson(one.getProjectUnitLegal()); legalEvaluate.setProNo(one.getProNo()); legalEvaluate.setProCode(one.getProCode()); + legalEvaluate.setCycle(dayOfYear + "-" + 1 + "至" + dayOfYear + "-" + 3); + BsSgcjsjdBuiProInfo byId = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); + if (ObjectUtil.isEmpty(byId)){ + legalEvaluate.setEvaluateStatus("0"); + } + bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); + legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i+2); + legalEvaluate.setCycle(dayOfYear + "-" + 4 + "至" + dayOfYear + "-" + 6); + BsSgcjsjdBuiProInfo byId1 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); + if (ObjectUtil.isEmpty(byId1)){ + legalEvaluate.setEvaluateStatus("0"); + } + bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i+3); legalEvaluate.setCycle(dayOfYear + "-" + 7 + "至" + dayOfYear + "-" + 9); BsSgcjsjdBuiProInfo byId2 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); @@ -362,19 +368,6 @@ public class evaluateTask { legalEvaluate.setEvaluateStatus("0"); } bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); - - legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i+4); - legalEvaluate.setCycle(dayOfYear + "-" + 10 + "至" + dayOfYear + "-" + 12); - BsSgcjsjdBuiProInfo byId3 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); - if (ObjectUtil.isEmpty(byId3)){ - legalEvaluate.setEvaluateStatus("0"); - } - bsSgcJsjdBuiLegalEvaluateService.saveOrUpdate(legalEvaluate); - }else { - BsSgcJsjdBuiLegalEvaluate legalEvaluate = new BsSgcJsjdBuiLegalEvaluate(); - legalEvaluate.setLegalPerson(one.getProjectUnitLegal()); - legalEvaluate.setProNo(one.getProNo()); - legalEvaluate.setProCode(one.getProCode()); legalEvaluate.setId(bsSgcJsjdBuiConstrMeas.getId() + i+4); legalEvaluate.setCycle(dayOfYear + "-" + 10 + "至" + dayOfYear + "-" + 12); BsSgcjsjdBuiProInfo byId3 = bsSgcjsjdBuiProInfoService.getById(legalEvaluate.getId()); diff --git a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiRealName.java b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiRealName.java index 02273b1a..c96a9baf 100644 --- a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiRealName.java +++ b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiRealName.java @@ -53,6 +53,23 @@ public class BsSgcJsjdBuiRealName extends BaseEntity /** 籍贯 */ private String nativePlace; + /** 性别 */ + private String gender; + + /** 学历 */ + private String education; + + /** 政治面貌 */ + private String politicalAffiliation; + + private String age; + + /** '工资卡类别 */ + private String cardCategory; + /** 人员状态 0表示离职 1表示在职 */ + private String status; + /** '所属班组' */ + private String crew; /** $column.columnComment */ private String createUid; diff --git a/jwtech-system/src/main/java/com/kms/statistics/controller/BsSgcJsjdBuiSalaryStatisticsController.java b/jwtech-system/src/main/java/com/kms/statistics/controller/BsSgcJsjdBuiSalaryStatisticsController.java new file mode 100644 index 00000000..a5166f95 --- /dev/null +++ b/jwtech-system/src/main/java/com/kms/statistics/controller/BsSgcJsjdBuiSalaryStatisticsController.java @@ -0,0 +1,114 @@ +package com.kms.statistics.controller; + +import java.util.Arrays; +import java.util.List; + +import com.jianwei.common.core.controller.BaseController; +import com.jianwei.common.core.domain.SearchParam; +import com.jianwei.common.utils.poi.ExcelUtil; +import com.kms.common.utils.BaseEntityUtils; + + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jianwei.common.mybaitsplus.BeanToWrapper; + +import com.jianwei.common.annotation.Log; +import com.jianwei.common.core.domain.AjaxResult; +import com.jianwei.common.enums.BusinessType; +import com.kms.statistics.domain.BsSgcJsjdBuiSalaryStatistics; +import com.kms.statistics.service.BsSgcJsjdBuiSalaryStatisticsService; + + +/** + * 工资统计Controller + * + * @author kms + * @date 2024-06-17 + */ +@RestController +@RequestMapping("/statistics/salary") +@Api(tags = "工资统计") +public class BsSgcJsjdBuiSalaryStatisticsController extends BaseController +{ + @Autowired + private BsSgcJsjdBuiSalaryStatisticsService bsSgcJsjdBuiSalaryStatisticsService; + + /** + * 查询工资统计列表 + */ + @PostMapping("/list") + @ApiOperation("工资统计列表") + public IPage list(@RequestBody SearchParam sp) + { + return bsSgcJsjdBuiSalaryStatisticsService.selectPage(sp); + } + + /** + * 导出工资统计列表 + */ + @Log(title = "工资统计导出", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ApiOperation("工资统计导出") + public AjaxResult export(@RequestBody BsSgcJsjdBuiSalaryStatistics bsSgcJsjdBuiSalaryStatistics) + { + List list = bsSgcJsjdBuiSalaryStatisticsService.listByIds(bsSgcJsjdBuiSalaryStatistics.getIds()); + ExcelUtil util = new ExcelUtil<>(BsSgcJsjdBuiSalaryStatistics.class); + return util.exportExcel(list, "salary"); + } + + /** + * 获取工资统计详细信息 + */ + @ApiOperation(" 工资统计详情") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") String id) + { + return AjaxResult.success(bsSgcJsjdBuiSalaryStatisticsService.getById(id)); + } + + /** + * 新增工资统计 + */ + @Log(title = "工资统计新增", businessType = BusinessType.INSERT) + @PostMapping + @ApiOperation("工资统计新增") + public AjaxResult add(@RequestBody BsSgcJsjdBuiSalaryStatistics bsSgcJsjdBuiSalaryStatistics) + { + BaseEntityUtils.preInsert(bsSgcJsjdBuiSalaryStatistics); + return toAjax(bsSgcJsjdBuiSalaryStatisticsService.save(bsSgcJsjdBuiSalaryStatistics)); + } + + /** + * 修改工资统计 + */ + @ApiOperation("工资统计修改") + @Log(title = "工资统计修改", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody BsSgcJsjdBuiSalaryStatistics bsSgcJsjdBuiSalaryStatistics) + { + return toAjax(bsSgcJsjdBuiSalaryStatisticsService.updateById(bsSgcJsjdBuiSalaryStatistics)); + } + + /** + * 删除工资统计 + */ + @ApiOperation("工资统计删除") + @Log(title = "工资统计删除", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable String[] ids) + { + return toAjax(bsSgcJsjdBuiSalaryStatisticsService.removeByIds(Arrays.asList(ids))); + } +} diff --git a/jwtech-system/src/main/java/com/kms/statistics/domain/BsSgcJsjdBuiSalaryStatistics.java b/jwtech-system/src/main/java/com/kms/statistics/domain/BsSgcJsjdBuiSalaryStatistics.java new file mode 100644 index 00000000..512180a6 --- /dev/null +++ b/jwtech-system/src/main/java/com/kms/statistics/domain/BsSgcJsjdBuiSalaryStatistics.java @@ -0,0 +1,58 @@ +package com.kms.statistics.domain; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.jianwei.common.annotation.Excel; + +import com.baomidou.mybatisplus.annotation.TableName; + + +import com.jianwei.common.core.domain.BaseEntity; + +/** + * 工资统计对象 bs_sgc_jsjd_bui_salary_statistics + * + * @author kms + * @date 2024-06-17 + */ +@TableName("bs_sgc_jsjd_bui_salary_statistics") +@Data +@ApiModel("工资统计") +public class BsSgcJsjdBuiSalaryStatistics extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + @ApiModelProperty("${comment}") + private String proNo; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + @ApiModelProperty("${comment}") + private String proCode; + + /** 当期应发 */ + @Excel(name = "当期应发") + @ApiModelProperty("当期应发") + private String currentPayable; + + /** 当期实发 */ + @Excel(name = "当期实发") + @ApiModelProperty("当期实发") + private String currentNetPay; + + /** 当期拖欠金额 */ + @Excel(name = "当期拖欠金额") + @ApiModelProperty("当期拖欠金额") + private String currentArrears; + + /** 累计拖欠金额（万元） */ + @Excel(name = "累计拖欠金额", readConverterExp = "万=元") + @ApiModelProperty("累计拖欠金额") + private String cumulativeArrears; + +} diff --git a/jwtech-system/src/main/java/com/kms/statistics/mapper/BsSgcJsjdBuiSalaryStatisticsMapper.java b/jwtech-system/src/main/java/com/kms/statistics/mapper/BsSgcJsjdBuiSalaryStatisticsMapper.java new file mode 100644 index 00000000..c9452f96 --- /dev/null +++ b/jwtech-system/src/main/java/com/kms/statistics/mapper/BsSgcJsjdBuiSalaryStatisticsMapper.java @@ -0,0 +1,16 @@ +package com.kms.statistics.mapper; + +import org.springframework.stereotype.Repository; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.kms.statistics.domain.BsSgcJsjdBuiSalaryStatistics; + +/** + * 工资统计Mapper接口 + * + * @author kms + * @date 2024-06-17 + */ +@Repository +public interface BsSgcJsjdBuiSalaryStatisticsMapper extends BaseMapper { + +} diff --git a/jwtech-system/src/main/java/com/kms/statistics/service/BsSgcJsjdBuiSalaryStatisticsService.java b/jwtech-system/src/main/java/com/kms/statistics/service/BsSgcJsjdBuiSalaryStatisticsService.java new file mode 100644 index 00000000..adbb875b --- /dev/null +++ b/jwtech-system/src/main/java/com/kms/statistics/service/BsSgcJsjdBuiSalaryStatisticsService.java @@ -0,0 +1,17 @@ +package com.kms.statistics.service; + +import org.springframework.stereotype.Service; +import com.jianwei.common.core.service.BaseService; +import com.kms.statistics.mapper.BsSgcJsjdBuiSalaryStatisticsMapper; +import com.kms.statistics.domain.BsSgcJsjdBuiSalaryStatistics; + +/** + * 工资统计Service接口 + * + * @author kms + * @date 2024-06-17 + */ +@Service +public class BsSgcJsjdBuiSalaryStatisticsService extends BaseService{ + +}