格克

jeecg-boot-module-demo/src/main/java/org/jeecg/modules/geke/salary/mapper/xml/SalaryMapper.xml

@@ -61,7 +61,18 @@
     </delete>
 
     <select id="querySalary" resultType="org.jeecg.modules.geke.salary.entity.Salary">
-        select *from geke_gz_body where 1=1
+        select  IFNULL(sr_wages,0) as 'srWages',IFNULL(sr_jx_wages,0) as 'srJxWages',IFNULL(sr_bonus,0) as 'srBonus',
+        IFNULL(sr_subsidy,0) as 'srSubsidy',IFNULL(sr_jb_wages,0) as 'srJbWages',IFNULL(sr_quit,0) as 'srQuit',
+        IFNULL(sr_gd_bonus,0) as 'srGdBonus',IFNULL(sr_year_bonus,0) as 'srYearBonus',IFNULL(sr_other,0) as 'srOther',
+        IFNULL(kk_lack,0) as 'kkLack',IFNULL(kk_other,0) as 'kkOther',IFNULL(gr_pension,0) as 'grPension',
+        IFNULL(gr_cause,0) as 'grCause',IFNULL(gr_medical,0) as 'grMedical',IFNULL(gr_fund,0) as 'grFund',
+        IFNULL(gs_pension,0) as 'gsPension',IFNULL(gs_cause,0) as 'gsCause',IFNULL(gs_fund,0) as 'gsFund',
+        IFNULL(gs_injury,0) as 'gsInjury',IFNULL(gs_birth,0) as 'gsBirth',IFNULL(sd_personal,0) as 'sdPersonal',
+        IFNULL(sd_bonus,0) as 'sdBonus',IFNULL(sd_other,0) as 'sdOther',IFNULL(yingfa,0) as 'yingfa',
+        IFNULL(shifa,0) as 'shifa',IFNULL(gs_medical,0) as 'gsMedical',IFNULL(kq_wages,0) as 'kqWages',
+        IFNULL(kq_count,0) as 'kqCount',IFNULL(bj_count,0) as 'bjCount',IFNULL(jb_count,0) as 'jbCount',
+        IFNULL(sr_gw_wages,0) as 'srGwWages'
+        from geke_gz_body where 1=1
         <if test="headerId!=null and ''!=headerId">
             and user_id=#{headerId}
         </if>

jeecg-boot-module-demo/src/main/java/org/jeecg/modules/geke/userPrize/entity/UserPrize.java

@@ -64,4 +64,6 @@ public class UserPrize {
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "日期")
 	private java.util.Date date;
+
+	private  transient String realname;
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java

@@ -734,6 +734,7 @@ public class SysUserController {
             u.setBankCard("例:622************142");
             u.setBankAddr("例:上海工商银行徐汇支行");
             u.setSyFund("例:061***********245");
+            u.setWagesOne("例:10000");
             pageList=new ArrayList<>();
             pageList.add(u);
         }
@@ -824,8 +825,27 @@ public class SysUserController {
                         if (!"".equals(sysUserExcel.getRealname())&&sysUserExcel.getRealname()!=null){
                             if (!"".equals(sysUserExcel.getEmail())&&sysUserExcel.getEmail()!=null){
                                 if (!"".equals(sysUserExcel.getOrgCodeTxt())&&sysUserExcel.getOrgCodeTxt()!=null){
-                                    sysUserService.addUserWithRole(sysUserExcel, "1473241527673765890");
-                                    successLines++;
+                                    if ("".equals(sysUserExcel.getSyFund())&&sysUserExcel.getSyFund()!=null){
+                                        if ("".equals(sysUserExcel.getPhone())&&sysUserExcel.getPhone()!=null){
+                                            if ("".equals(sysUserExcel.getBankCard())&&sysUserExcel.getBankCard()!=null){
+                                                if ("".equals(sysUserExcel.getWagesOne())&&sysUserExcel.getWagesOne()!=null){
+                                                    if ("".equals(sysUserExcel.getSfzCode())&&sysUserExcel.getSfzCode()!=null){
+                                                        if ("".equals(sysUserExcel.getEgName())&&sysUserExcel.getEgName()!=null){
+                                                            if (sysUserExcel.getBirthday()!=null){
+                                                                if (sysUserExcel.getBirthday()!=null){
+                                                                    if ("".equals(sysUserExcel.getSex())&&sysUserExcel.getSex()!=null){
+                                                                        sysUserService.addUserWithRole(sysUserExcel, "1473241527673765890");
+                                                                        successLines++;
+                                                                    }
+                                                                }
+                                                            }
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+
                                 }
                             }
 
@@ -1750,7 +1770,7 @@ public class SysUserController {
     public String sendEamilCode(String userid) {
         String card="";
         SysUser ones = sysUserService.getOnes(userid);
-        if (ones!=null){
+        if (ones!=null&&ones.getSfzCode()!=null){
             card=ones.getSfzCode().substring(0,6);
         }
         return card;//返回验证码

jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysUser.java

@@ -66,12 +66,12 @@ public class SysUser implements Serializable {
     /**
      * 生日
      */
-    @Excel(name = "生日", width = 15, format = "yyyy-MM-dd")
+    @Excel(name = "*生日", width = 15, format = "yyyy-MM-dd")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date birthday;
 
-    @Excel(name = "公积金账号", width = 15)
+    @Excel(name = "*公积金账号", width = 15)
     private String syFund;
 
     /**
@@ -145,13 +145,19 @@ public class SysUser implements Serializable {
     @Excel(name = "*部门", width = 15)
     private transient String orgCodeTxt;
 
-    @Excel(name = "*银行账号", width = 15)
+    @Excel(name = "*银行卡号", width = 15)
     @TableField(typeHandler = AESEncryptHandler.class)
     private String bankCard;
 
 
     @Excel(name = "开户行", width = 15)
     private String bankAddr;
+
+    /**
+     * 基本工资一
+     */
+    @Excel(name = "*基本工资", width = 15)
+    private  String wagesOne;
     /**
      * 雇佣状态 10在职 20离退 30离职
      */
@@ -272,10 +278,7 @@ public class SysUser implements Serializable {
     /**设备id uniapp推送用*/
     private String clientId;
 
-    /**
-     * 基本工资一
-     */
-    private  String wagesOne;
+
     /**
      * 基本工资二
      */

jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml

@@ -289,7 +289,7 @@ on a.depart_name=b.orgCodeTxt
 		 </if>
 	</select>
 	<select id="getOnes" resultMap="userMap">
-		SELECT id,username,realname,password,salt,avatar,birthday,sex,email,phone,org_code,status,del_flag,work_no,post,telephone,create_by,create_time,update_by,update_time,activiti_sync,user_identity,depart_ids,rel_tenant_ids,client_id,eg_name,birth_date,entry_date,urgent_name,urgent_phone,bank_card
+		SELECT id,username,sfz_code,realname,password,salt,avatar,birthday,sex,email,phone,org_code,status,del_flag,work_no,post,telephone,create_by,create_time,update_by,update_time,activiti_sync,user_identity,depart_ids,rel_tenant_ids,client_id,eg_name,birth_date,entry_date,urgent_name,urgent_phone,bank_card
 		FROM sys_user
 		WHERE 1=1
 		<if test="id!=null and ''!=id">

jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java

@@ -162,6 +162,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 			if (user.getUserIdentity().equals("1")||user.getUserIdentity()==1){
 				SysUserRole userRole = new SysUserRole(user.getId(), "1473241527673765890");
 				sysUserRoleMapper.insert(userRole);
+			}else if (user.getUserIdentity().equals("2")||user.getUserIdentity()==2){
+				SysUserRole userRole = new SysUserRole(user.getId(), "1462659329857978370");
+				sysUserRoleMapper.insert(userRole);
 			}
 		}
 	}
@@ -172,15 +175,17 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 	public void editUserWithRole(SysUser user, String roles) {
 		this.updateById(user);
 		//先删后加
-		sysUserRoleMapper.delete(new QueryWrapper<SysUserRole>().lambda().eq(SysUserRole::getUserId, user.getId()));
 		if(oConvertUtils.isNotEmpty(roles)) {
 			String[] arr = roles.split(",");
+			sysUserRoleMapper.delete(new QueryWrapper<SysUserRole>().lambda().eq(SysUserRole::getUserId, user.getId()));
+
 			for (String roleId : arr) {
 				SysUserRole userRole = new SysUserRole(user.getId(), roleId);
 				sysUserRoleMapper.insert(userRole);
 			}
 		}else {
 			if (user.getUserIdentity().equals("1")||user.getUserIdentity()==1){
+				sysUserRoleMapper.delete(new QueryWrapper<SysUserRole>().lambda().eq(SysUserRole::getUserId, user.getId()));
 				SysUserRole userRole = new SysUserRole(user.getId(), "1473241527673765890");
 				sysUserRoleMapper.insert(userRole);
 			}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/WeixinUserImpl.java

@@ -1445,7 +1445,11 @@ public class WeixinUserImpl implements IWeixinUserService{
                        salarys.setSrWages(lt.get("content").toString());
                    }else if (lt.get("name").equals("考勤工资")){
                        salarys.setKqWages(lt.get("content").toString());
-                   }else if (lt.get("name").equals("考勤天数")){
+                   }else if (lt.get("name").equals("年终奖")){
+                        salarys.setSrYearBonus(lt.get("content").toString());
+                    }else if (lt.get("name").equals("年终奖代扣税")){
+                        salarys.setSdBonus(lt.get("content").toString());
+                    }else if (lt.get("name").equals("考勤天数")){
                        salarys.setKqCount(lt.get("content").toString());
                    }else if (lt.get("name").equals("累计病假天数")){
                        salarys.setBjCount(lt.get("content").toString());
@@ -1489,8 +1493,8 @@ public class WeixinUserImpl implements IWeixinUserService{
                        salarys.setGsInjury(lt.get("content").toString());
                    }else if (lt.get("name").equals("应发合计")){
                         salarys.setYingfa(lt.get("content").toString());
-                    }else if (lt.get("name").equals("实发合计")){
-                        salarys.setShifa(lt.get("content").toString());
+                    }else if (lt.get("name").equals("扣款合计")){
+                        salarys.setSdOther(lt.get("content").toString());
                     }
                 });