Skip to content

8
8timerapiv200
Commit 585bdb16 by leialin
Options

Merge branch 'lal' into 'develop' 

提交

See merge request 8timerv2/8timerapiv200!530
parents 8b323242 7c253507
Showing with 13 additions and 15 deletions
src/main/java/cn/timer/api/bean/xcgl/XcglAssoXzb.java
...@@ -49,7 +49,7 @@ public class XcglAssoXzb extends Model<XcglAssoXzb> { ...@@ -49,7 +49,7 @@ public class XcglAssoXzb extends Model<XcglAssoXzb> {
private Integer xzxid; private Integer xzxid;
@ApiModelProperty(value="薪资项结果 ",example="薪资项结果") @ApiModelProperty(value="薪资项结果 ",example="薪资项结果")
private String xzxjg; private Double xzxjg;
@ApiModelProperty(value="企业id ",example="企业id") @ApiModelProperty(value="企业id ",example="企业id")
private Integer qyid; private Integer qyid;
......
src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java
...@@ -1300,7 +1300,7 @@ public class SalaryManagementController { ...@@ -1300,7 +1300,7 @@ public class SalaryManagementController {
xzb.setUserid(xzuryone.getUserid());// xzb.setUserid(xzuryone.getUserid());//
xzb.setXzyf(impor.getSxrq());// xzb.setXzyf(impor.getSxrq());//
xzb.setXzxid(ims[p].getJsgzzx());// xzb.setXzxid(ims[p].getJsgzzx());//
xzb.setXzxjg(String.valueOf(ims[p].getSrz()));// xzb.setXzxjg(Double.valueOf(ims[p].getSrz()));//
xzb.setQyid(userBean.getOrgCode()); xzb.setQyid(userBean.getOrgCode());
xcglassoxzbmapper.ModifyImportedSalary(xzb); xcglassoxzbmapper.ModifyImportedSalary(xzb);
k++; k++;
...@@ -1310,7 +1310,7 @@ public class SalaryManagementController { ...@@ -1310,7 +1310,7 @@ public class SalaryManagementController {
xzb.setUserid(yhmpp.getUserid());// xzb.setUserid(yhmpp.getUserid());//
xzb.setXzyf(impor.getSxrq());// xzb.setXzyf(impor.getSxrq());//
xzb.setXzxid(ims[p].getJsgzzx());// xzb.setXzxid(ims[p].getJsgzzx());//
xzb.setXzxjg(String.valueOf(ims[p].getSrz()));// xzb.setXzxjg(Double.valueOf(ims[p].getSrz()));//
xzb.setQyid(userBean.getOrgCode()); xzb.setQyid(userBean.getOrgCode());
xcglassoxzbmapper.ModifyImportedSalary(xzb); xcglassoxzbmapper.ModifyImportedSalary(xzb);
} }
...@@ -1428,7 +1428,7 @@ public class SalaryManagementController { ...@@ -1428,7 +1428,7 @@ public class SalaryManagementController {
xzb.setUserid(znr.getUserid());//用户id xzb.setUserid(znr.getUserid());//用户id
xzb.setXzyf(xzyf);//薪资月 xzb.setXzyf(xzyf);//薪资月
xzb.setXzxid(cal.getId());//薪资项id xzb.setXzxid(cal.getId());//薪资项id
xzb.setXzxjg(cal.getRsz());//薪资项结果 xzb.setXzxjg(Double.valueOf(cal.getRsz()));//薪资项结果
xzb.setQyid(userBean.getOrgCode()); xzb.setQyid(userBean.getOrgCode());
xcglassoxzbmapper.xzbinsert(xzb); xcglassoxzbmapper.xzbinsert(xzb);
} }
...@@ -1440,7 +1440,7 @@ public class SalaryManagementController { ...@@ -1440,7 +1440,7 @@ public class SalaryManagementController {
xzb.setUserid(znr.getUserid());//用户id xzb.setUserid(znr.getUserid());//用户id
xzb.setXzyf(xzyf);//薪资月 xzb.setXzyf(xzyf);//薪资月
xzb.setXzxid(cal.getId());//薪资项id xzb.setXzxid(cal.getId());//薪资项id
xzb.setXzxjg("0");//薪资项结果 xzb.setXzxjg(0.0);//薪资项结果
xzb.setQyid(userBean.getOrgCode()); xzb.setQyid(userBean.getOrgCode());
xcglassoxzbmapper.xzbinsert(xzb); xcglassoxzbmapper.xzbinsert(xzb);
} }
...@@ -1503,7 +1503,7 @@ public class SalaryManagementController { ...@@ -1503,7 +1503,7 @@ public class SalaryManagementController {
xzb.setXzyf(xzyf);//薪资月 xzb.setXzyf(xzyf);//薪资月
} }
xzb.setXzxid(xtzd.getId());//薪资项id xzb.setXzxid(xtzd.getId());//薪资项id
xzb.setXzxjg(("").equals(autacq) ? "0" : autacq);//薪资项结果 xzb.setXzxjg(("").equals(autacq) ? 0.0 : Double.valueOf(autacq));//薪资项结果
xzb.setQyid(userBean.getOrgCode()); xzb.setQyid(userBean.getOrgCode());
xcglassoxzbmapper.xzbinsert(xzb); xcglassoxzbmapper.xzbinsert(xzb);
}else { }else {
...@@ -1517,7 +1517,7 @@ public class SalaryManagementController { ...@@ -1517,7 +1517,7 @@ public class SalaryManagementController {
xzb.setXzyf(xzyf);//薪资月 xzb.setXzyf(xzyf);//薪资月
} }
xzb.setXzxid(xtzd.getId());//薪资项id xzb.setXzxid(xtzd.getId());//薪资项id
xzb.setXzxjg("");//薪资项结果 xzb.setXzxjg(null);//薪资项结果
xzb.setQyid(userBean.getOrgCode()); xzb.setQyid(userBean.getOrgCode());
xcglassoxzbmapper.xzbinsert(xzb); xcglassoxzbmapper.xzbinsert(xzb);
}else { }else {
...@@ -1526,7 +1526,7 @@ public class SalaryManagementController { ...@@ -1526,7 +1526,7 @@ public class SalaryManagementController {
xzb.setUserid(znr.getUserid());//用户id xzb.setUserid(znr.getUserid());//用户id
xzb.setXzyf(xzyf);//薪资月 xzb.setXzyf(xzyf);//薪资月
xzb.setXzxid(xtzd.getId());//薪资项id xzb.setXzxid(xtzd.getId());//薪资项id
xzb.setXzxjg("0");//薪资项结果 xzb.setXzxjg(0.0);//薪资项结果
xzb.setQyid(userBean.getOrgCode()); xzb.setQyid(userBean.getOrgCode());
xcglassoxzbmapper.xzbinsert(xzb); xcglassoxzbmapper.xzbinsert(xzb);
} }
...@@ -1553,7 +1553,7 @@ public class SalaryManagementController { ...@@ -1553,7 +1553,7 @@ public class SalaryManagementController {
xzb.setUserid(znr.getUserid());//用户id xzb.setUserid(znr.getUserid());//用户id
xzb.setXzyf(xzyf);//薪资月 xzb.setXzyf(xzyf);//薪资月
xzb.setXzxid(xtzd.getId());//薪资项id xzb.setXzxid(xtzd.getId());//薪资项id
xzb.setXzxjg("0");//薪资项结果 xzb.setXzxjg(0.0);//薪资项结果
xzb.setQyid(userBean.getOrgCode()); xzb.setQyid(userBean.getOrgCode());
xcglassoxzbmapper.xzbinsert(xzb); xcglassoxzbmapper.xzbinsert(xzb);
...@@ -1563,7 +1563,7 @@ public class SalaryManagementController { ...@@ -1563,7 +1563,7 @@ public class SalaryManagementController {
xzb.setUserid(znr.getUserid());//用户id xzb.setUserid(znr.getUserid());//用户id
xzb.setXzyf(xzyf);//薪资月 xzb.setXzyf(xzyf);//薪资月
xzb.setXzxid(xtzd.getId());//薪资项id xzb.setXzxid(xtzd.getId());//薪资项id
xzb.setXzxjg("0");//薪资项结果 xzb.setXzxjg(0.0);//薪资项结果
xzb.setQyid(userBean.getOrgCode()); xzb.setQyid(userBean.getOrgCode());
xcglassoxzbmapper.xzbinsert(xzb); xcglassoxzbmapper.xzbinsert(xzb);
} }
...@@ -1866,7 +1866,7 @@ public class SalaryManagementController { ...@@ -1866,7 +1866,7 @@ public class SalaryManagementController {
xzb.setUserid(znr.getUserid());//用户id xzb.setUserid(znr.getUserid());//用户id
xzb.setXzyf(xzyf);//薪资月 xzb.setXzyf(xzyf);//薪资月
xzb.setXzxid(payatt.getId());//薪资项id xzb.setXzxid(payatt.getId());//薪资项id
xzb.setXzxjg(String.valueOf(autacq));//薪资项结果 xzb.setXzxjg(Double.valueOf(autacq));//薪资项结果
xzb.setQyid(userBean.getOrgCode()); xzb.setQyid(userBean.getOrgCode());
xcglassoxzbmapper.xzbinsert(xzb); xcglassoxzbmapper.xzbinsert(xzb);
}else { }else {
...@@ -1876,7 +1876,7 @@ public class SalaryManagementController { ...@@ -1876,7 +1876,7 @@ public class SalaryManagementController {
xzb.setUserid(znr.getUserid());//用户id xzb.setUserid(znr.getUserid());//用户id
xzb.setXzyf(xzyf);//薪资月 xzb.setXzyf(xzyf);//薪资月
xzb.setXzxid(payatt.getId());//薪资项id xzb.setXzxid(payatt.getId());//薪资项id
xzb.setXzxjg("0");//薪资项结果 xzb.setXzxjg(0.0);//薪资项结果
xzb.setQyid(userBean.getOrgCode()); xzb.setQyid(userBean.getOrgCode());
xcglassoxzbmapper.xzbinsert(xzb); xcglassoxzbmapper.xzbinsert(xzb);
......
src/main/resources/mapping/xcgl/XcglAssoXzbMapper.xml
...@@ -74,9 +74,7 @@ ...@@ -74,9 +74,7 @@
left join zzgl_bmgw_m um on um.id = m.up_id left join zzgl_bmgw_m um on um.id = m.up_id
) as bmgw on bmgw.mid = emp.bmgw_id ) as bmgw on bmgw.mid = emp.bmgw_id
where emp.emp_num in (select xzury.userid from xcgl_asso_xzury xzury where xzury.xzzid = #{paygroupid}) where emp.emp_num in (select xzury.userid from xcgl_asso_xzury xzury where xzury.xzzid = #{paygroupid})
and (xzbs.xzyf = #{xzyf} or xzbs.xzyf = '') <if test="text != null and text != ''" >
and emp.emp_num in (select xzury.userid from xcgl_asso_xzury xzury where xzury.xzzid = #{paygroupid})
<if test="text != ''" >
and (emp.`name` like CONCAT('%',#{text},'%') or emp.emp_num = #{text}) and (emp.`name` like CONCAT('%',#{text},'%') or emp.emp_num = #{text})
</if> </if>
) as aa ) as aa
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment