移动端工资条查询调整

src/main/java/com/xjrsoft/module/personnel/dto/BasePersonnelLabourCapitalYearPageDto.java

@@ -19,4 +19,10 @@ public class BasePersonnelLabourCapitalYearPageDto extends PageInput {
 
     @ApiModelProperty("发放项目")
     public String project;
+
+    @ApiModelProperty("工号")
+    public String jobNumber;
+
+    @ApiModelProperty("姓名")
+    public String name;
 }

src/main/java/com/xjrsoft/module/personnel/service/impl/BasePersonnelLabourCapitalServiceImpl.java

@@ -1,10 +1,13 @@
 package com.xjrsoft.module.personnel.service.impl;
 
+import cn.dev33.satoken.stp.StpUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.xjrsoft.module.organization.entity.User;
+import com.xjrsoft.module.organization.service.IUserService;
 import com.xjrsoft.module.personnel.dto.BasePersonnelLabourCapitalMonthPageDto;
 import com.xjrsoft.module.personnel.dto.BasePersonnelLabourCapitalYearPageDto;
 import com.xjrsoft.module.personnel.entity.BasePersonnelLabourCapital;
@@ -35,14 +38,15 @@ import java.util.stream.Collectors;
 @Service
 @AllArgsConstructor
 public class BasePersonnelLabourCapitalServiceImpl extends MPJBaseServiceImpl<BasePersonnelLabourCapitalMapper, BasePersonnelLabourCapital> implements IBasePersonnelLabourCapitalService {
-    private final BasePersonnelLabourCapitalMapper basePersonnelLabourCapitalBasePersonnelLabourCapitalMapper;
+    private final BasePersonnelLabourCapitalMapper labourCapitalMapper;
 
-    private final BasePersonnelLabourCapitalDataMapper basePersonnelLabourCapitalBasePersonnelLabourCapitalDataMapper;
-    private final BasePersonnelLabourCapitalTitleMapper basePersonnelLabourCapitalBasePersonnelLabourCapitalTitleMapper;
+    private final BasePersonnelLabourCapitalDataMapper capitalDataMapper;
+    private final BasePersonnelLabourCapitalTitleMapper capitalTitleMapper;
+    private final IUserService userService;
 
     @Override
     public Page<BasePersonnelLabourCapitalMonthPageVo> getMonthPage(Page<BasePersonnelLabourCapitalMonthPageDto> page, BasePersonnelLabourCapitalMonthPageDto dto) {
-        Page<BasePersonnelLabourCapitalMonthPageVo> resultPage = basePersonnelLabourCapitalBasePersonnelLabourCapitalMapper.getMonthPage(page, dto);
+        Page<BasePersonnelLabourCapitalMonthPageVo> resultPage = labourCapitalMapper.getMonthPage(page, dto);
 
         for (BasePersonnelLabourCapitalMonthPageVo record : resultPage.getRecords()) {
             JSONObject extendJsonObj = JSON.parseObject(record.getPendingJson());
@@ -63,11 +67,15 @@ public class BasePersonnelLabourCapitalServiceImpl extends MPJBaseServiceImpl<Ba
 
     @Override
     public Page<BasePersonnelLabourCapitalYearPageVo> getYearPage(Page<BasePersonnelLabourCapitalYearPageDto> page, BasePersonnelLabourCapitalYearPageDto dto) {
-        return basePersonnelLabourCapitalBasePersonnelLabourCapitalMapper.getYearPage(page, dto);
+        long userId = StpUtil.getLoginIdAsLong();
+        User user = userService.getById(userId);
+        dto.setJobNumber(user.getUserName());
+        dto.setName(user.getName());
+        return labourCapitalMapper.getYearPage(page, dto);
     }
 
     private String getBpName(String columnNumber) {
-        List<BasePersonnelLabourCapitalTitle> bpTitles = basePersonnelLabourCapitalBasePersonnelLabourCapitalTitleMapper.selectList(Wrappers.<BasePersonnelLabourCapitalTitle>lambdaQuery().eq(BasePersonnelLabourCapitalTitle::getColumnNumber, columnNumber));
+        List<BasePersonnelLabourCapitalTitle> bpTitles = capitalTitleMapper.selectList(Wrappers.<BasePersonnelLabourCapitalTitle>lambdaQuery().eq(BasePersonnelLabourCapitalTitle::getColumnNumber, columnNumber));
         if (bpTitles != null && !bpTitles.isEmpty()) {
             return bpTitles.get(0).getName();
         } else {
@@ -78,14 +86,14 @@ public class BasePersonnelLabourCapitalServiceImpl extends MPJBaseServiceImpl<Ba
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean add(BasePersonnelLabourCapital basePersonnelLabourCapital) {
-        basePersonnelLabourCapitalBasePersonnelLabourCapitalMapper.insert(basePersonnelLabourCapital);
+        labourCapitalMapper.insert(basePersonnelLabourCapital);
         for (BasePersonnelLabourCapitalData basePersonnelLabourCapitalData : basePersonnelLabourCapital.getBasePersonnelLabourCapitalDataList()) {
             basePersonnelLabourCapitalData.setLabourCapitalId(basePersonnelLabourCapital.getId());
-            basePersonnelLabourCapitalBasePersonnelLabourCapitalDataMapper.insert(basePersonnelLabourCapitalData);
+            capitalDataMapper.insert(basePersonnelLabourCapitalData);
         }
         for (BasePersonnelLabourCapitalTitle basePersonnelLabourCapitalTitle : basePersonnelLabourCapital.getBasePersonnelLabourCapitalTitleList()) {
             basePersonnelLabourCapitalTitle.setLabourCapitalId(basePersonnelLabourCapital.getId());
-            basePersonnelLabourCapitalBasePersonnelLabourCapitalTitleMapper.insert(basePersonnelLabourCapitalTitle);
+            capitalTitleMapper.insert(basePersonnelLabourCapitalTitle);
         }
 
         return true;
@@ -94,11 +102,11 @@ public class BasePersonnelLabourCapitalServiceImpl extends MPJBaseServiceImpl<Ba
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean update(BasePersonnelLabourCapital basePersonnelLabourCapital) {
-        basePersonnelLabourCapitalBasePersonnelLabourCapitalMapper.updateById(basePersonnelLabourCapital);
+        labourCapitalMapper.updateById(basePersonnelLabourCapital);
         //********************************* BasePersonnelLabourCapitalData  增删改  开始 *******************************************/
         {
             // 查出所有子级的id
-            List<BasePersonnelLabourCapitalData> basePersonnelLabourCapitalDataList = basePersonnelLabourCapitalBasePersonnelLabourCapitalDataMapper.selectList(Wrappers.lambdaQuery(BasePersonnelLabourCapitalData.class).eq(BasePersonnelLabourCapitalData::getLabourCapitalId, basePersonnelLabourCapital.getId()).select(BasePersonnelLabourCapitalData::getId));
+            List<BasePersonnelLabourCapitalData> basePersonnelLabourCapitalDataList = capitalDataMapper.selectList(Wrappers.lambdaQuery(BasePersonnelLabourCapitalData.class).eq(BasePersonnelLabourCapitalData::getLabourCapitalId, basePersonnelLabourCapital.getId()).select(BasePersonnelLabourCapitalData::getId));
             List<Long> basePersonnelLabourCapitalDataIds = basePersonnelLabourCapitalDataList.stream().map(BasePersonnelLabourCapitalData::getId).collect(Collectors.toList());
             //原有子表单 没有被删除的主键
             List<Long> basePersonnelLabourCapitalDataOldIds = basePersonnelLabourCapital.getBasePersonnelLabourCapitalDataList().stream().map(BasePersonnelLabourCapitalData::getId).filter(Objects::nonNull).collect(Collectors.toList());
@@ -108,18 +116,18 @@ public class BasePersonnelLabourCapitalServiceImpl extends MPJBaseServiceImpl<Ba
             for (BasePersonnelLabourCapitalData basePersonnelLabourCapitalData : basePersonnelLabourCapital.getBasePersonnelLabourCapitalDataList()) {
                 //如果不等于空则修改
                 if (basePersonnelLabourCapitalData.getId() != null) {
-                    basePersonnelLabourCapitalBasePersonnelLabourCapitalDataMapper.updateById(basePersonnelLabourCapitalData);
+                    capitalDataMapper.updateById(basePersonnelLabourCapitalData);
                 }
                 //如果等于空 则新增
                 else {
                     //已经不存在的id 删除
                     basePersonnelLabourCapitalData.setLabourCapitalId(basePersonnelLabourCapital.getId());
-                    basePersonnelLabourCapitalBasePersonnelLabourCapitalDataMapper.insert(basePersonnelLabourCapitalData);
+                    capitalDataMapper.insert(basePersonnelLabourCapitalData);
                 }
             }
             //已经不存在的id 删除
             if(basePersonnelLabourCapitalDataRemoveIds.size() > 0){
-                basePersonnelLabourCapitalBasePersonnelLabourCapitalDataMapper.deleteBatchIds(basePersonnelLabourCapitalDataRemoveIds);
+                capitalDataMapper.deleteBatchIds(basePersonnelLabourCapitalDataRemoveIds);
             }
         }
         //********************************* BasePersonnelLabourCapitalData  增删改  结束 *******************************************/
@@ -127,7 +135,7 @@ public class BasePersonnelLabourCapitalServiceImpl extends MPJBaseServiceImpl<Ba
         //********************************* BasePersonnelLabourCapitalTitle  增删改  开始 *******************************************/
         {
             // 查出所有子级的id
-            List<BasePersonnelLabourCapitalTitle> basePersonnelLabourCapitalTitleList = basePersonnelLabourCapitalBasePersonnelLabourCapitalTitleMapper.selectList(Wrappers.lambdaQuery(BasePersonnelLabourCapitalTitle.class).eq(BasePersonnelLabourCapitalTitle::getLabourCapitalId, basePersonnelLabourCapital.getId()).select(BasePersonnelLabourCapitalTitle::getId));
+            List<BasePersonnelLabourCapitalTitle> basePersonnelLabourCapitalTitleList = capitalTitleMapper.selectList(Wrappers.lambdaQuery(BasePersonnelLabourCapitalTitle.class).eq(BasePersonnelLabourCapitalTitle::getLabourCapitalId, basePersonnelLabourCapital.getId()).select(BasePersonnelLabourCapitalTitle::getId));
             List<Long> basePersonnelLabourCapitalTitleIds = basePersonnelLabourCapitalTitleList.stream().map(BasePersonnelLabourCapitalTitle::getId).collect(Collectors.toList());
             //原有子表单 没有被删除的主键
             List<Long> basePersonnelLabourCapitalTitleOldIds = basePersonnelLabourCapital.getBasePersonnelLabourCapitalTitleList().stream().map(BasePersonnelLabourCapitalTitle::getId).filter(Objects::nonNull).collect(Collectors.toList());
@@ -137,18 +145,18 @@ public class BasePersonnelLabourCapitalServiceImpl extends MPJBaseServiceImpl<Ba
             for (BasePersonnelLabourCapitalTitle basePersonnelLabourCapitalTitle : basePersonnelLabourCapital.getBasePersonnelLabourCapitalTitleList()) {
                 //如果不等于空则修改
                 if (basePersonnelLabourCapitalTitle.getId() != null) {
-                    basePersonnelLabourCapitalBasePersonnelLabourCapitalTitleMapper.updateById(basePersonnelLabourCapitalTitle);
+                    capitalTitleMapper.updateById(basePersonnelLabourCapitalTitle);
                 }
                 //如果等于空 则新增
                 else {
                     //已经不存在的id 删除
                     basePersonnelLabourCapitalTitle.setLabourCapitalId(basePersonnelLabourCapital.getId());
-                    basePersonnelLabourCapitalBasePersonnelLabourCapitalTitleMapper.insert(basePersonnelLabourCapitalTitle);
+                    capitalTitleMapper.insert(basePersonnelLabourCapitalTitle);
                 }
             }
             //已经不存在的id 删除
             if(basePersonnelLabourCapitalTitleRemoveIds.size() > 0){
-                basePersonnelLabourCapitalBasePersonnelLabourCapitalTitleMapper.deleteBatchIds(basePersonnelLabourCapitalTitleRemoveIds);
+                capitalTitleMapper.deleteBatchIds(basePersonnelLabourCapitalTitleRemoveIds);
             }
         }
         //********************************* BasePersonnelLabourCapitalTitle  增删改  结束 *******************************************/
@@ -159,9 +167,9 @@ public class BasePersonnelLabourCapitalServiceImpl extends MPJBaseServiceImpl<Ba
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean delete(List<Long> ids) {
-        basePersonnelLabourCapitalBasePersonnelLabourCapitalMapper.deleteBatchIds(ids);
-        basePersonnelLabourCapitalBasePersonnelLabourCapitalDataMapper.delete(Wrappers.lambdaQuery(BasePersonnelLabourCapitalData.class).in(BasePersonnelLabourCapitalData::getLabourCapitalId, ids));
-        basePersonnelLabourCapitalBasePersonnelLabourCapitalTitleMapper.delete(Wrappers.lambdaQuery(BasePersonnelLabourCapitalTitle.class).in(BasePersonnelLabourCapitalTitle::getLabourCapitalId, ids));
+        labourCapitalMapper.deleteBatchIds(ids);
+        capitalDataMapper.delete(Wrappers.lambdaQuery(BasePersonnelLabourCapitalData.class).in(BasePersonnelLabourCapitalData::getLabourCapitalId, ids));
+        capitalTitleMapper.delete(Wrappers.lambdaQuery(BasePersonnelLabourCapitalTitle.class).in(BasePersonnelLabourCapitalTitle::getLabourCapitalId, ids));
 
         return true;
     }

src/main/java/com/xjrsoft/module/personnel/vo/BasePersonnelLabourCapitalMonthPageVo.java

@@ -33,7 +33,7 @@ public class BasePersonnelLabourCapitalMonthPageVo {
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("总计")
     @ApiModelProperty("总计")
-    private float amount;
+    private String amount;
 
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("待处理json")

src/main/java/com/xjrsoft/module/personnel/vo/BasePersonnelLabourCapitalYearPageVo.java

@@ -41,15 +41,15 @@ public class BasePersonnelLabourCapitalYearPageVo {
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("金额")
     @ApiModelProperty("金额")
-    private float amount;
+    private String amount;
 
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("月金额")
     @ApiModelProperty("月金额")
-    private float monthAmount;
+    private String monthAmount;
 
     @ContentStyle(dataFormat = 49)
     @ExcelProperty("年金额")
     @ApiModelProperty("年金额")
-    private float yearAmount;
+    private String yearAmount;
 }

src/main/resources/mapper/personnel/BasePersonnelLabourCapitalMapper.xml

@@ -33,8 +33,8 @@
             d.name as dept,
             month(t1.date_of_issue) as month,
             t.amount_to as amount,
-            SUM(t.amount_to) OVER (PARTITION BY t.create_user_id, MONTH(t1.date_of_issue)) as monthAmount,
-            (SELECT SUM(amount_to) FROM base_personnel_labour_capital_data WHERE name = t.name) as yearAmount
+            SUM(replace(t.amount_to,',','')) OVER (PARTITION BY t.create_user_id, MONTH(t1.date_of_issue)) as monthAmount,
+            (SELECT SUM(replace(amount_to,',','')) FROM base_personnel_labour_capital_data WHERE name = t.name) as yearAmount
         from base_personnel_labour_capital_data t
                  LEFT JOIN base_personnel_labour_capital t1 ON t.labour_capital_id = t1.id
                  LEFT JOIN xjr_user u ON t.job_number = u.user_name
@@ -44,7 +44,7 @@
         WHERE
             t.delete_mark = 0
         and YEAR(t1.date_of_issue) = #{dto.year}
-        and t1.name = #{dto.project}
+        and t.job_number = #{dto.jobNumber}
     </select>
 </mapper>
         <!--    SELECT-->

src/test/java/com/xjrsoft/module/job/JianyuekbScheduleTaskTest2.java

@@ -137,7 +137,7 @@ class JianyuekbScheduleTaskTest2 {
         doExecute();
     }
     public void doExecute() {
-        String sql = "SELECT * FROM course_receive_msg WHERE delete_mark = 0 AND is_callback = -1";
+        String sql = "SELECT * FROM course_receive_msg WHERE delete_mark = 0 AND is_callback = null";
         List<Map<String, Object>> receiveMsgs = SqlRunnerAdapter.db().selectList(sql);
         if(receiveMsgs.isEmpty()){
             return;