项目迁移

src/main/java/com/muzhi/lanyun/controller/DingOaController.java

@@ -56,6 +56,10 @@ public class DingOaController {
         return chaifencLanyun;
     }
 
+
+    /**
+     * 蓝云档案汇总表
+     * */
     //获取数据库中【蓝云档案汇总表】实体类表数据进行前端接口调用展示数据
     @ApiOperation(value = "获取数据库中【蓝云档案汇总表】实体类表数据进行前端接口调用展示数据")
     @GetMapping("getDanganLanyun")
@@ -66,6 +70,39 @@ public class DingOaController {
         return danganLanyun;
     }
 
+    /**
+     * ⬇⬇⬇宜搭批量导入表单写入数据库的方法⬇⬇⬇
+     * */
+    //导入薪资档案
+    @ApiOperation(value = "导入薪资档案")
+    @PostMapping("importXZDA")
+    public R importXZDA(String data, String formInstId){
+
+        R importXZDA = dingOaService.importXZDA(data, formInstId);
+        return importXZDA;
+    }
+
+    //导入浮动数据
+    @ApiOperation(value = "导入浮动数据")
+    @PostMapping("importFDSJ")
+    public R importFDSJ(String data, String formInstId){
+
+        R importFDSJ = dingOaService.importFDSJ(data, formInstId);
+        return importFDSJ;
+    }
+
+    //导入社保公积金
+    @ApiOperation(value = "导入社保公积金")
+    @PostMapping("importSBGJJ")
+    public R importSBGJJ(String data, String formInstId){
+
+        R importSBGJJ = dingOaService.importSBGJJ(data, formInstId);
+        return importSBGJJ;
+    }
+    /**
+     * ⬆⬆⬆宜搭批量导入表单写入数据库的方法⬆⬆⬆
+     * */
+
 
     //获取钉钉组织架构人员信息-同步至宜搭人员信息表
     @ApiOperation(value = "获取钉钉组织架构人员信息-同步至宜搭人员信息表")
@@ -82,9 +119,6 @@ public class DingOaController {
     //获取宜搭人员信息表，更新宜搭人员状态
     @ApiOperation(value = "获取宜搭人员信息表，更新宜搭人员状态")
     @PostMapping("getRenyuanStatus")
-//    @Scheduled(cron = "0 30 22 * * ?")//每天22：31触发（也就是凌晨22点01分触发）
-//    @Scheduled(cron = "0 0/10 * * * ?")//每10分钟执行一次
-//    @Scheduled(cron = "0 */10 * * * ?")//每隔10分钟执行一次
     public String getRenyuanStatus(){
 
         String renyuanStatus = dingOaService.getRenyuanStatus();
@@ -107,29 +141,66 @@ public class DingOaController {
     //批量修改档案及浮动数据方法
     @ApiOperation(value = "批量修改档案及浮动数据方法")
     @PostMapping("updateDangan")
-//    @Scheduled(cron = "0 0 22 * * ?")//每天23：10触发（也就是凌晨23点10分触发）
-//    @Scheduled(cron = "0 10 0 * * ?")//每天00：10触发（也就是凌晨0点10分触发）
-//    @Scheduled(cron = "0 0/10 * * * ?")//每10分钟执行一次
-//    @Scheduled(cron = "0 */10 * * * ?")//每隔10分钟执行一次
-    public R updateDangan(@RequestBody JSONObject obj) throws Exception{
+    public R updateDangan(@RequestBody JSONObject obj){
 
         R updateDangan = dingOaService.updateDangan(obj);
         return updateDangan;
     }
 
-    //计算同步薪资总表数据-同步至宜搭【工资核算表（A）】表单
+    //批量修改工资核算A表数据
+    @ApiOperation(value = "批量修改工资核算A表数据")
+    @PostMapping("updateXinziA")
+    public R updateXinziA(@RequestBody JSONObject obj){
+
+        R updateXinziA = dingOaService.updateXinziA(obj);
+        return updateXinziA;
+    }
+
+    /**
+     * ======计算同步薪资总表数据-同步至宜搭【工资核算表（A）】表单======
+     */
     @ApiOperation(value = "计算同步薪资总表数据-同步至宜搭【工资核算表（A）】表单")
     @PostMapping("tongbuXinzihesuanA")
 //    @Scheduled(cron = "0 0 22 * * ?")//每天23：10触发（也就是凌晨23点10分触发）
 //    @Scheduled(cron = "0 10 0 * * ?")//每天00：10触发（也就是凌晨0点10分触发）
 //    @Scheduled(cron = "0 0/10 * * * ?")//每10分钟执行一次
 //    @Scheduled(cron = "0 */10 * * * ?")//每隔10分钟执行一次
-    public R tongbuXinzihesuanA(@RequestBody JSONObject obj) throws Exception{
+    public R tongbuXinzihesuanA(@RequestBody JSONObject obj){
 
         R tongbuXinzihesuanA = dingOaService.tongbuXinzihesuanA(obj);
         return tongbuXinzihesuanA;
     }
 
+    /**
+     * ======拆分金额-薪资总表数据-同步至宜搭【工资核算表（B）（C）】表单======
+     */
+    @ApiOperation(value = "拆分金额-薪资总表数据-同步至宜搭【工资核算表（B）（C）】表单")
+    @PostMapping("chaifenjine")
+//    @Scheduled(cron = "0 0 22 * * ?")//每天23：10触发（也就是凌晨23点10分触发）
+//    @Scheduled(cron = "0 10 0 * * ?")//每天00：10触发（也就是凌晨0点10分触发）
+//    @Scheduled(cron = "0 0/10 * * * ?")//每10分钟执行一次
+//    @Scheduled(cron = "0 */10 * * * ?")//每隔10分钟执行一次
+    public R chaifenjine(@RequestBody JSONObject obj){
+
+        R chaifenjine = dingOaService.chaifenjine(obj);
+        return chaifenjine;
+    }
+
+    /**
+     * ======拆分归属-薪资总表数据-同步至宜搭【工资核算表（B）（C）】表单======
+     */
+    @ApiOperation(value = "拆分归属-薪资总表数据-同步至宜搭【工资核算表（B）（C）】表单")
+    @PostMapping("chaifenguishu")
+//    @Scheduled(cron = "0 0 22 * * ?")//每天23：10触发（也就是凌晨23点10分触发）
+//    @Scheduled(cron = "0 10 0 * * ?")//每天00：10触发（也就是凌晨0点10分触发）
+//    @Scheduled(cron = "0 0/10 * * * ?")//每10分钟执行一次
+//    @Scheduled(cron = "0 */10 * * * ?")//每隔10分钟执行一次
+    public R chaifenguishu(@RequestBody JSONObject obj){
+
+        R chaifenguishu = dingOaService.chaifenguishu(obj);
+        return chaifenguishu;
+    }
+
     /**
      * 表单打开时加载（默认加载出所属部门）【废弃，未启用】
      */

src/main/java/com/muzhi/lanyun/entity/DanganLanyun.java

@@ -16,99 +16,106 @@ import java.math.BigDecimal;
 @Accessors(chain = true)
 @ApiModel(value = "档案信息", description = "档案汇总表")
 public class DanganLanyun {
+    /**
+     * 人员基础信息
+     * */
     @Basic
     @Column(name = "工资序列")
     private Integer gongzixulie;
     @Basic
     @Column(name = "所属类别")
-    private String suoshuleibie;
+    private String suoshuleibie;//
     @Basic
     @Column(name = "计算年月")
-    private String jisuannianyue;
+    private String jisuannianyue;//
     @Basic
     @Column(name = "员工编码：钉钉userid")
-    private String yuangongbianma;
+    private String yuangongbianma;//
     @Basic
     @Column(name = "员工姓名")
-    private String yuangongxingming;
+    private String yuangongxingming;//
     @Basic
     @Column(name = "身份证号")
-    private String shenfenzhenghao;
+    private String shenfenzhenghao;//
     @Basic
     @Column(name = "性别")
-    private String xingbie;
+    private String xingbie;//
     @Basic
     @Column(name = "出生日期")
-    private String chushengriqi;
+    private String chushengriqi;//
     @Basic
     @Column(name = "年龄")
-    private BigDecimal nianling;
+    private BigDecimal nianling;//
     @Basic
     @Column(name = "入职日期")
-    private String ruzhiriqi;
+    private String ruzhiriqi;//
     @Basic
     @Column(name = "司龄")
-    private BigDecimal siling;
+    private BigDecimal siling;//
     @Basic
     @Column(name = "员工状态")
-    private String yuangongzhuangtai;
+    private String yuangongzhuangtai;//
     @Basic
     @Column(name = "移动电话")
-    private String yidongdianhua;
+    private String yidongdianhua;//
     @Basic
     @Column(name = "银行名称")
-    private String yinhangmingcheng;
+    private String yinhangmingcheng;//
     @Basic
     @Column(name = "银行卡号")
-    private String yinhangkahao;
+    private String yinhangkahao;//
     @Basic
     @Column(name = "劳动归属")
-    private String laodongguishu;
+    private String laodongguishu;//
     @Basic
     @Column(name = "劳务归属1")
-    private String laowuguishu1;
+    private String laowuguishu1;//
     @Basic
     @Column(name = "劳务归属2")
-    private String laowuguishu2;
+    private String laowuguishu2;//
     @Basic
     @Column(name = "部门id")
-    private String bumenid;
+    private String bumenid;//
     @Basic
     @Column(name = "部门")
-    private String bumen;
+    private String bumen;//
     @Basic
     @Column(name = "职位名称")
-    private String zhiweimingcheng;
+    private String zhiweimingcheng;//
     @Basic
     @Column(name = "岗位名称")
-    private String gangweimingcheng;
+    private String gangweimingcheng;//
+
+    /**
+     * 薪资档案
+     * */
     @Basic
     @Column(name = "薪资等级")
-    private String xinzidengji;
+    private String xinzidengji;//
     @Basic
     @Column(name = "级别工资")
-    private BigDecimal jibiegongzi;
+    private BigDecimal jibiegongzi;//
     @Basic
     @Column(name = "薪资标准")
-    private BigDecimal xinzibiaozhun;
+    private BigDecimal xinzibiaozhun;//
     @Basic
     @Column(name = "基本工资")
-    private BigDecimal jibengongzi;
+    private BigDecimal jibengongzi;//
     @Basic
     @Column(name = "岗位工资")
-    private BigDecimal gangweigongzi;
+    private BigDecimal gangweigongzi;//
     @Basic
     @Column(name = "技能工资")
-    private BigDecimal jinenggongzi;
+    private BigDecimal jinenggongzi;//
     @Basic
     @Column(name = "保密工资")
-    private BigDecimal baomigongzi;
+    private BigDecimal baomigongzi;//
     @Basic
     @Column(name = "延顶工资")
-    private BigDecimal yandinggongzi;
+    private BigDecimal yandinggongzi;//
     @Basic
     @Column(name = "绩效工资")
-    private BigDecimal jixiaogongzi;
+    private BigDecimal jixiaogongzi;//
     @Basic
     @Column(name = "考核得分")
     private BigDecimal kaohedefen;
@@ -120,7 +127,7 @@ public class DanganLanyun {
     private BigDecimal gongzixiaoji;
     @Basic
     @Column(name = "固定拆分金额")
-    private BigDecimal gudingchaifenjine;
+    private BigDecimal gudingchaifenjine;//
     @Basic
     @Column(name = "浮动拆分金额")
     private BigDecimal fudongchaifenjine;
@@ -129,7 +136,7 @@ public class DanganLanyun {
     private BigDecimal quanbuchaifenjine;
     @Basic
     @Column(name = "排班班次")
-    private String paibanbanci;
+    private String paibanbanci;//
     @Basic
     @Column(name = "标准工时")
     private BigDecimal biaozhungongshi;
@@ -156,13 +163,13 @@ public class DanganLanyun {
     private BigDecimal quanqinjishu;
     @Basic
     @Column(name = "全勤奖金")
-    private BigDecimal quanqinjiangjin;
+    private BigDecimal quanqinjiangjin;//
     @Basic
     @Column(name = "顶班时数")
     private BigDecimal dingbanshishu;
     @Basic
     @Column(name = "顶班系数")
-    private BigDecimal dingbanxishu;
+    private BigDecimal dingbanxishu;//
     @Basic
     @Column(name = "顶班工资")
     private BigDecimal dingbangongzi;
@@ -171,7 +178,7 @@ public class DanganLanyun {
     private BigDecimal waipaishishu;
     @Basic
     @Column(name = "外派系数")
-    private BigDecimal waipaixishu;
+    private BigDecimal waipaixishu;//
     @Basic
     @Column(name = "外派工资")
     private BigDecimal waipaigongzi;
@@ -180,7 +187,7 @@ public class DanganLanyun {
     private BigDecimal yanshijiabanshishu;
     @Basic
     @Column(name = "延时加班系数")
-    private BigDecimal yanshijiabanxishu;
+    private BigDecimal yanshijiabanxishu;//
     @Basic
     @Column(name = "延时加班工资")
     private BigDecimal yanshijiabangongzi;
@@ -189,7 +196,7 @@ public class DanganLanyun {
     private BigDecimal shuangxiujiabanshishu;
     @Basic
     @Column(name = "双休加班系数")
-    private BigDecimal shuangxiujiabanxishu;
+    private BigDecimal shuangxiujiabanxishu;//
     @Basic
     @Column(name = "双休加班工资")
     private BigDecimal shuangxiujiabangongzi;
@@ -198,7 +205,7 @@ public class DanganLanyun {
     private BigDecimal jiaqijiabanshishu;
     @Basic
     @Column(name = "假期加班系数")
-    private BigDecimal jiaqijiabanxishu;
+    private BigDecimal jiaqijiabanxishu;//
     @Basic
     @Column(name = "假期加班工资")
     private BigDecimal jiaqijiabangongzi;
@@ -210,7 +217,7 @@ public class DanganLanyun {
     private BigDecimal yebanbutieshishu;
     @Basic
     @Column(name = "夜班补贴系数")
-    private BigDecimal yebanbutiexishu;
+    private BigDecimal yebanbutiexishu;//
     @Basic
     @Column(name = "夜班补贴金额")
     private BigDecimal yebanbutiejine;
@@ -219,106 +226,113 @@ public class DanganLanyun {
     private BigDecimal canfeibutietianshu;
     @Basic
     @Column(name = "餐费补贴系数")
-    private BigDecimal canfeibutiexishu;
+    private BigDecimal canfeibutiexishu;//
     @Basic
     @Column(name = "餐费补贴金额")
-    private BigDecimal canfeibutiejine;
+    private BigDecimal canfeibutiejine;//
     @Basic
-    @Column(name = "高温不给时数")
-    private BigDecimal gaowenbutieshishu;
+    @Column(name = "高温补贴时数")
+    private BigDecimal gaowenbutieshishu;//
     @Basic
     @Column(name = "高温补贴金额")
     private BigDecimal gaowenbutiejine;
     @Basic
     @Column(name = "管理补贴金额")
-    private BigDecimal guanlibutiejine;
+    private BigDecimal guanlibutiejine;//
     @Basic
     @Column(name = "社保补贴金额")
-    private BigDecimal shebaobutiejine;
+    private BigDecimal shebaobutiejine;//
     @Basic
     @Column(name = "公积补贴金额")
-    private BigDecimal gongjibutiejine;
+    private BigDecimal gongjibutiejine;//
     @Basic
     @Column(name = "社保公积补差")
-    private BigDecimal shebaogongjibucha;
+    private BigDecimal shebaogongjibucha;//
     @Basic
     @Column(name = "交通补贴金额")
-    private BigDecimal jiaotongbutiejine;
+    private BigDecimal jiaotongbutiejine;//
     @Basic
     @Column(name = "话费补贴金额")
-    private BigDecimal huafeibutiejine;
+    private BigDecimal huafeibutiejine;//
     @Basic
     @Column(name = "住房补贴金额")
-    private BigDecimal zhufangbutiejine;
+    private BigDecimal zhufangbutiejine;//
     @Basic
     @Column(name = "工龄补贴金额")
-    private BigDecimal gonglingbutiejine;
+    private BigDecimal gonglingbutiejine;//
     @Basic
     @Column(name = "高空补贴金额")
-    private BigDecimal gaokongbutiejine;
+    private BigDecimal gaokongbutiejine;//
     @Basic
     @Column(name = "出差补贴金额")
-    private BigDecimal chuchaibutiejine;
+    private BigDecimal chuchaibutiejine;//
     @Basic
     @Column(name = "培训补贴金额")
-    private BigDecimal peixunbutiejine;
+    private BigDecimal peixunbutiejine;//
     @Basic
     @Column(name = "其他补贴金额")
-    private BigDecimal qitabutiejine;
+    private BigDecimal qitabutiejine;//
     @Basic
     @Column(name = "补贴金额小计")
     private BigDecimal butiejinexiaoji;
+
+    /**
+     * 补贴金额
+     * */
     @Basic
     @Column(name = "奖励金额")
-    private BigDecimal jianglijine;
+    private BigDecimal jianglijine;//
     @Basic
     @Column(name = "提成奖金")
-    private BigDecimal tichengjiangjin;
+    private BigDecimal tichengjiangjin;//
     @Basic
     @Column(name = "转正补差")
-    private BigDecimal zhuanzhengbucha;
+    private BigDecimal zhuanzhengbucha;//
     @Basic
     @Column(name = "工资补差")
-    private BigDecimal gongzibucha;
+    private BigDecimal gongzibucha;//
     @Basic
     @Column(name = "缺勤扣款")
     private BigDecimal queqinkoukuan;
     @Basic
     @Column(name = "考勤扣款")
-    private BigDecimal kaoqinkoukuan;
+    private BigDecimal kaoqinkoukuan;//
     @Basic
     @Column(name = "处罚金额")
-    private BigDecimal chufajine;
+    private BigDecimal chufajine;//
     @Basic
     @Column(name = "其他扣款")
-    private BigDecimal qitakoukuan;
+    private BigDecimal qitakoukuan;//
     @Basic
     @Column(name = "应发工资")
     private BigDecimal yingfagongzi;
     @Basic
+    @Column(name = "社保缴纳基数")
+    private BigDecimal shebaojiaonajishu;//
+    @Basic
     @Column(name = "个人养老")
-    private BigDecimal gerenyanglao;
+    private BigDecimal gerenyanglao;//
     @Basic
     @Column(name = "个人医疗")
-    private BigDecimal gerenyiliao;
+    private BigDecimal gerenyiliao;//
     @Basic
     @Column(name = "个人生育")
-    private BigDecimal gerenshengyu;
+    private BigDecimal gerenshengyu;//
     @Basic
     @Column(name = "个人工伤")
-    private BigDecimal gerengongshang;
+    private BigDecimal gerengongshang;//
     @Basic
     @Column(name = "个人失业")
-    private BigDecimal gerenshiye;
+    private BigDecimal gerenshiye;//
     @Basic
     @Column(name = "个人大病医疗")
-    private BigDecimal gerendabingyiliao;
+    private BigDecimal gerendabingyiliao;//
     @Basic
     @Column(name = "个人公积金")
-    private BigDecimal gerengongjijin;
+    private BigDecimal gerengongjijin;//
     @Basic
     @Column(name = "个人补充公积金")
-    private BigDecimal gerenbuchonggongjijin;
+    private BigDecimal gerenbuchonggongjijin;//
     @Basic
     @Column(name = "个人社保小计")
     private BigDecimal gerenshebaoxiaoji;
@@ -330,34 +344,34 @@ public class DanganLanyun {
     private BigDecimal shuiqiangongzi;
     @Basic
     @Column(name = "工会扣款")
-    private BigDecimal gonghuikoukuan;
+    private BigDecimal gonghuikoukuan;//
     @Basic
     @Column(name = "个税扣款")
     private BigDecimal geshuikoukuan;
     @Basic
     @Column(name = "个税调整")
-    private BigDecimal geshuitiaozheng;
+    private BigDecimal geshuitiaozheng;//
     @Basic
     @Column(name = "特殊扣款")
-    private BigDecimal teshukoukuan;
+    private BigDecimal teshukoukuan;//
     @Basic
     @Column(name = "实发工资")
     private BigDecimal shifagongzi;
     @Basic
     @Column(name = "是否拆分金额")
-    private String shifouchaifenjine;
+    private String shifouchaifenjine;//
     @Basic
     @Column(name = "实际拆分金额")
     private BigDecimal shijichaifenjine;
     @Basic
     @Column(name = "拆分归属标记1")
-    private String chaifenguishubiaoji1;
+    private String chaifenguishubiaoji1;//
     @Basic
     @Column(name = "拆分归属标记2")
-    private String chaifenguishubiaoji2;
+    private String chaifenguishubiaoji2;//
     @Basic
     @Column(name = "拆分归属标记3")
-    private String chaifenguishubiaoji3;
+    private String chaifenguishubiaoji3;//
     @Basic
     @Column(name = "社保缴纳城市")
     private String shebaojiaonachengshi;
@@ -434,6 +448,16 @@ public class DanganLanyun {
     @Column(name = "服务费")
     private BigDecimal fuwufei;
 
+    @Basic
+    @Column(name = "薪资档案实例id")
+    private String xzdaslid;
+    @Basic
+    @Column(name = "浮动数据实例id")
+    private String fdsjslid;
+    @Basic
+    @Column(name = "人员档案实例id")
+    private String rydaslid;
+
 //    public String getGongzixulie() {
 //        return gongzixulie;
 //    }

src/main/java/com/muzhi/lanyun/entity/XinziLanyun.java

@@ -21,6 +21,9 @@ public class XinziLanyun {
     @Column(name = "校验状态")
     private String state;
     @Basic
+    @Column(name = "异常信息")
+    private String errmessage;
+    @Basic
     @Column(name = "所属类别")
     private String suoshuleibie;
     @Basic
@@ -225,7 +228,7 @@ public class XinziLanyun {
     @Column(name = "餐费补贴金额")
     private BigDecimal canfeibutiejine;
     @Basic
-    @Column(name = "高温不给时数")
+    @Column(name = "高温补贴时数")
     private BigDecimal gaowenbutieshishu;
     @Basic
     @Column(name = "高温补贴金额")
@@ -297,6 +300,9 @@ public class XinziLanyun {
     @Column(name = "应发工资")
     private BigDecimal yingfagongzi;
     @Basic
+    @Column(name = "社保缴纳基数")
+    private BigDecimal shebaojiaonajishu;
+    @Basic
     @Column(name = "个人养老")
     private BigDecimal gerenyanglao;
     @Basic

src/main/java/com/muzhi/lanyun/entity/vo/DanganLanyunQuery.java

@@ -20,4 +20,7 @@ public class DanganLanyunQuery {
 
     @ApiModelProperty(value = "人员姓名,模糊查询")
     private String ryxm;
+
+    @ApiModelProperty(value = "计算年月,匹配查询")
+    private String jsny;
 }

src/main/java/com/muzhi/lanyun/entity/vo/XinziLanyunQuery.java

@@ -20,4 +20,7 @@ public class XinziLanyunQuery {
 
     @ApiModelProperty(value = "人员姓名,模糊查询")
     private String ryxm;
+
+    @ApiModelProperty(value = "计算年月,匹配查询")
+    private String jsny;
 }

src/main/java/com/muzhi/lanyun/mapper/ChaifenbLanyunMapper.java

@@ -1,11 +0,0 @@
-package com.muzhi.lanyun.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.muzhi.lanyun.entity.ChaifenbLanyun;
-import org.springframework.stereotype.Repository;
-
-//在对应的Mapper上面继承基本的类BaseMapper
-@Repository//代表持久层，或者加入@Mapper注解
-public interface ChaifenbLanyunMapper extends BaseMapper<ChaifenbLanyun> {
-    //所有的CRUD操作都已经编写完成了
-}

src/main/java/com/muzhi/lanyun/mapper/ChaifencLanyunMapper.java

@@ -1,11 +0,0 @@
-package com.muzhi.lanyun.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.muzhi.lanyun.entity.ChaifencLanyun;
-import org.springframework.stereotype.Repository;
-
-//在对应的Mapper上面继承基本的类BaseMapper
-@Repository//代表持久层，或者加入@Mapper注解
-public interface ChaifencLanyunMapper extends BaseMapper<ChaifencLanyun> {
-    //所有的CRUD操作都已经编写完成了
-}

src/main/java/com/muzhi/lanyun/mapper/xml/ChaifenbLanyunMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-        <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.muzhi.lanyun.mapper.ChaifenbLanyunMapper">
-
-</mapper>

src/main/java/com/muzhi/lanyun/mapper/xml/ChaifencLanyunMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-        <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.muzhi.lanyun.mapper.ChaifencLanyunMapper">
-
-</mapper>

src/main/java/com/muzhi/lanyun/service/DingOaService.java

@@ -2,8 +2,8 @@ package com.muzhi.lanyun.service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.muzhi.lanyun.common.R;
-import com.muzhi.lanyun.entity.ChaifenbLanyun;
-import com.muzhi.lanyun.entity.ChaifencLanyun;
+import com.muzhi.lanyun.entity.XinzichaifenbLanyun;
+import com.muzhi.lanyun.entity.XinzichaifencLanyun;
 import com.muzhi.lanyun.entity.DanganLanyun;
 import com.muzhi.lanyun.entity.XinziLanyun;
 import com.muzhi.lanyun.entity.vo.DanganLanyunQuery;
@@ -23,27 +23,29 @@ public interface DingOaService {
     public LanyunDataVo<XinziLanyun> getXinziLanyun(Integer currentPage, Integer pageSize, XinziLanyunQuery xinziLanyunQuery);
 
     //获取数据库中【拆分A表】实体类表数据进行前端接口调用展示数据
-    public LanyunDataVo<ChaifenbLanyun> getChaifenbLanyun(Integer currentPage, Integer pageSize, XinziLanyunQuery xinziLanyunQuery);
+    public LanyunDataVo<XinzichaifenbLanyun> getChaifenbLanyun(Integer currentPage, Integer pageSize, XinziLanyunQuery xinziLanyunQuery);
 
     //获取数据库中【拆分B表】实体类表数据进行前端接口调用展示数据
-    public LanyunDataVo<ChaifencLanyun> getChaifencLanyun(Integer currentPage, Integer pageSize, XinziLanyunQuery xinziLanyunQuery);
-
+    public LanyunDataVo<XinzichaifencLanyun> getChaifencLanyun(Integer currentPage, Integer pageSize, XinziLanyunQuery xinziLanyunQuery);
 
 
+    /**
+     * 蓝云档案汇总表
+     * */
     //获取数据库中【蓝云档案汇总表】实体类表数据进行前端接口调用展示数据
     public LanyunDataVo<DanganLanyun> getDanganLanyun(Integer currentPage, Integer pageSize, DanganLanyunQuery danganLanyunQuery);
 
     /**
      * ⬇⬇⬇宜搭批量导入表单写入数据库的方法⬇⬇⬇
      * */
-//    //导入薪资档案
-//    R importXZDA(JSONObject data);
-//
-//    //导入浮动数据
-//    R importFDSJ(JSONObject data);
-//
-//    //导入社保公积金
-//    R importSBGJJ(JSONObject data);
+    //导入薪资档案
+    R importXZDA(String data, String formInstId);
+
+    //导入浮动数据
+    R importFDSJ(String data, String formInstId);
+
+    //导入社保公积金
+    R importSBGJJ(String data, String formInstId);
     /**
      * ⬆⬆⬆宜搭批量导入表单写入数据库的方法⬆⬆⬆
      * */
@@ -60,8 +62,23 @@ public interface DingOaService {
     //批量修改档案及浮动数据方法
     R updateDangan(JSONObject obj);
 
-    //计算同步薪资总表数据-同步至宜搭【工资核算表（A）】表单
-    R tongbuXinzihesuanA(JSONObject obj) throws Exception;
+    //批量修改工资核算A表数据
+    R updateXinziA(JSONObject obj);
+
+    /**
+     * ======计算同步薪资总表数据-同步至宜搭【工资核算表（A）】表单======
+     */
+    R tongbuXinzihesuanA(JSONObject obj);
+
+    /**
+     * ======拆分金额-薪资总表数据-同步至宜搭【工资核算表（B）（C）】表单======
+     */
+    R chaifenjine(JSONObject obj);
+
+    /**
+     * ======拆分归属-薪资总表数据-同步至宜搭【工资核算表（B）（C）】表单======
+     */
+    R chaifenguishu(JSONObject obj);
 
     /**
      * 表单打开时加载（默认加载出所属部门）【废弃，未启用】

target/maven-archiver/pom.properties

@@ -1,3 +1,3 @@
-artifactId=lanyun
+artifactId=springboot
 groupId=com.muzhi.lanyun
-version=1.0-SNAPSHOT
+version=lanyun

target/surefire-reports/com.muzhi.lanyun.TestApplicationTests.txt

@@ -1,4 +1,4 @@
 -------------------------------------------------------------------------------
 Test set: com.muzhi.lanyun.TestApplicationTests
 -------------------------------------------------------------------------------
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 9.563 s - in com.muzhi.lanyun.TestApplicationTests
+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 8.215 s - in com.muzhi.lanyun.TestApplicationTests