修改实名制后台管理系统
This commit is contained in:
parent
56b7f3159b
commit
4416158550
|
|
@ -138,6 +138,14 @@ public class WorkerBenefitsController {
|
|||
AjaxRes ar = new AjaxRes();
|
||||
//根据id修改
|
||||
int result = service.updateBenefits(bean);
|
||||
|
||||
String delImg = bean.getDelImg();
|
||||
if(StringHelper.isNotEmpty(delImg)){
|
||||
String[] boardFileId = delImg.split(",");
|
||||
for (int j = 0;j < boardFileId.length;j++){
|
||||
service.delImg(boardFileId[j]);
|
||||
}
|
||||
}
|
||||
if(result==1){
|
||||
ar.setSucceed(GlobalConst.UPDATE_SUCCEED);
|
||||
}else {
|
||||
|
|
|
|||
|
|
@ -31,4 +31,6 @@ public interface WorkerBenefitsDao {
|
|||
int deleteBenefits(String id);
|
||||
|
||||
List<WorkerBenefitsBean> getWorkerBenefitsById(String id);
|
||||
|
||||
void delImg(String delImg);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,4 +12,6 @@ public class WorkerBenefitsBean extends WorkerBean {
|
|||
public String reportName; //相关资料 图片名称
|
||||
public String remark; //备注
|
||||
|
||||
public String delImg;// 删除的图片路径
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -24,4 +24,6 @@ public interface WorkerBenefitsService {
|
|||
int deleteBenefits(String id);
|
||||
|
||||
List<WorkerBenefitsBean> getWorkerBenefitsById(String id);
|
||||
|
||||
void delImg(String delImg);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -65,4 +65,9 @@ public class WorkerBenefitsServiceImpl implements WorkerBenefitsService {
|
|||
public List<WorkerBenefitsBean> getWorkerBenefitsById(String id) {
|
||||
return dao.getWorkerBenefitsById(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void delImg(String delImg) {
|
||||
dao.delImg(delImg);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -33,9 +33,13 @@
|
|||
UPDATE bns_smz_own_worker_benefits_file SET is_active = '0' WHERE pid = #{id}
|
||||
</update>
|
||||
|
||||
<update id="delImg">
|
||||
UPDATE bns_smz_own_worker_benefits_file SET is_active = '0' WHERE file_path = #{delImg}
|
||||
</update>
|
||||
|
||||
<select id="getListCount" resultType="java.lang.Integer">
|
||||
SELECT count(1)
|
||||
FROM `bns_smz_own_worker` w
|
||||
FROM bns_smz_own_worker w
|
||||
LEFT JOIN bns_smz_own_company c ON w.ssdw = c.id
|
||||
LEFT JOIN bns_smz_own_dict rylx ON w.rylx = rylx.id
|
||||
LEFT JOIN bns_smz_own_dict ryxz ON w.ryxz = ryxz.id
|
||||
|
|
@ -81,7 +85,7 @@
|
|||
c.org_name as ssdw,
|
||||
ryxz.`value` as ryxz,
|
||||
CASE WHEN w.state = '1' THEN '在职' else '离职' end as state
|
||||
FROM `bns_smz_own_worker` w
|
||||
FROM bns_smz_own_worker w
|
||||
LEFT JOIN bns_smz_own_company c ON w.ssdw = c.id
|
||||
LEFT JOIN bns_smz_own_dict rylx ON w.rylx = rylx.id
|
||||
LEFT JOIN bns_smz_own_dict ryxz ON w.ryxz = ryxz.id
|
||||
|
|
@ -128,8 +132,8 @@
|
|||
|
||||
select count(1) from (
|
||||
SELECT b.id,d.`value` as reportType, report_date as reportDate, GROUP_CONCAT(f.file_path) as reportPath
|
||||
FROM `bns_smz_own_worker_benefits` b
|
||||
LEFT JOIN bns_smz_own_worker_benefits_file f ON b.id = f.pid
|
||||
FROM bns_smz_own_worker_benefits b
|
||||
LEFT JOIN bns_smz_own_worker_benefits_file f ON b.id = f.pid and f.is_active = '1'
|
||||
LEFT JOIN bns_smz_own_dict d ON d.id = b.report_type
|
||||
WHERE worker_id = #{params.id} AND report_date BETWEEN #{params.startTime} AND #{params.endTime} and b.is_active = '1'
|
||||
<if test="params.reportType != null and params.reportType != '' ">
|
||||
|
|
@ -149,8 +153,8 @@
|
|||
|
||||
<select id="getWorkerBenefitsList" resultType="com.bonus.hnrn.rnbmw.ownPerson.entity.WorkerBenefitsBean">
|
||||
SELECT b.id,d.`value` as reportType, report_date as reportDate, GROUP_CONCAT(f.file_path) as reportPath
|
||||
FROM `bns_smz_own_worker_benefits` b
|
||||
LEFT JOIN bns_smz_own_worker_benefits_file f ON b.id = f.pid
|
||||
FROM bns_smz_own_worker_benefits b
|
||||
LEFT JOIN bns_smz_own_worker_benefits_file f ON b.id = f.pid and f.is_active = '1'
|
||||
LEFT JOIN bns_smz_own_dict d ON d.id = b.report_type
|
||||
WHERE worker_id = #{params.id} AND report_date BETWEEN #{params.startTime} AND #{params.endTime} and b.is_active = '1'
|
||||
<if test="params.reportType != null and params.reportType != '' ">
|
||||
|
|
@ -163,8 +167,8 @@
|
|||
|
||||
<select id="getWorkerBenefitsById" resultType="com.bonus.hnrn.rnbmw.ownPerson.entity.WorkerBenefitsBean">
|
||||
SELECT b.id,b.report_type as reportType, report_date as reportDate, f.file_path as reportPath,b.remark
|
||||
FROM `bns_smz_own_worker_benefits` b
|
||||
LEFT JOIN bns_smz_own_worker_benefits_file f ON b.id = f.pid
|
||||
FROM bns_smz_own_worker_benefits b
|
||||
LEFT JOIN bns_smz_own_worker_benefits_file f ON b.id = f.pid and f.is_active = '1'
|
||||
LEFT JOIN bns_smz_own_dict d ON d.id = b.report_type
|
||||
WHERE b.id = #{id}
|
||||
</select>
|
||||
|
|
|
|||
|
|
@ -166,7 +166,7 @@
|
|||
</select>
|
||||
|
||||
<insert id="insertList">
|
||||
INSERT INTO `bm_blacklist_worker` (`company_id`,`name`, `id_number`, `remark`,`event`, `dept`, `is_free`, `status`,start_time, end_time)
|
||||
INSERT INTO bns_smz_bm_blacklist_worker (`company_id`,`name`, `id_number`, `remark`,`event`, `dept`, `is_free`, `status`,start_time, end_time)
|
||||
values
|
||||
<foreach item="params" collection="list" separator=",">
|
||||
(#{params.companyId},#{params.name},#{params.idNumber}, #{params.remark}, #{params.event},#{params.dept},'0','1', #{params.startTime}, #{params.endTime})
|
||||
|
|
@ -174,22 +174,22 @@
|
|||
</insert>
|
||||
|
||||
<update id="updateGive">
|
||||
UPDATE `bm_worker_give` SET `is_active`='0' WHERE id_number = #{idNumber}
|
||||
UPDATE bns_smz_bm_worker_give SET `is_active`='0' WHERE id_number = #{idNumber}
|
||||
</update>
|
||||
|
||||
<!--新增-->
|
||||
<insert id="addBlacklist">
|
||||
INSERT INTO `bm_blacklist_worker` (`company_id`,`name`, `id_number`, `remark`, `event`, `dept`,`is_free`, `status` ,start_time, end_time)
|
||||
INSERT INTO bns_smz_bm_blacklist_worker (`company_id`,`name`, `id_number`, `remark`, `event`, `dept`,`is_free`, `status` ,start_time, end_time)
|
||||
values (#{companyId},#{name},#{idNumber},#{remark},#{event},#{dept},'0','1 ' ,#{startTime}, #{endTime})
|
||||
</insert>
|
||||
|
||||
<insert id="addBlackFreelist">
|
||||
INSERT INTO `bm_blacklist_worker` (`company_id`,`name`, `id_number`, `remark`, `event`, `dept`, `is_free` ,`status`)
|
||||
INSERT INTO bns_smz_bm_blacklist_worker (`company_id`,`name`, `id_number`, `remark`, `event`, `dept`, `is_free` ,`status`)
|
||||
values (#{companyId},#{name},#{idNumber},#{remark},#{event},#{dept},'1 ','1 ')
|
||||
</insert>
|
||||
|
||||
<insert id="insertFreeList">
|
||||
INSERT INTO `bm_blacklist_worker` (`company_id`,`name`, `id_number`, `remark`,`event`, `dept`, `is_free` ,`status`)
|
||||
INSERT INTO bns_smz_bm_blacklist_worker (`company_id`,`name`, `id_number`, `remark`,`event`, `dept`, `is_free` ,`status`)
|
||||
values
|
||||
<foreach item="params" collection="list" separator=",">
|
||||
(#{params.companyId},#{params.name},#{params.idNumber}, #{params.remark}, #{params.event},#{params.dept} ,'1' ,'1')
|
||||
|
|
@ -197,11 +197,11 @@
|
|||
</insert>
|
||||
|
||||
<update id="delBlacklist">
|
||||
DELETE FROM `bm_blacklist_worker` WHERE (`id_number`=#{idNumber} and is_free='0')
|
||||
DELETE FROM bns_smz_bm_blacklist_worker WHERE (`id_number`=#{idNumber} and is_free='0')
|
||||
</update>
|
||||
|
||||
<update id="delBlackFreelist">
|
||||
DELETE FROM `bm_blacklist_worker` WHERE (`id_number`=#{idNumber} and is_free='1')
|
||||
DELETE FROM bns_smz_bm_blacklist_worker WHERE (`id_number`=#{idNumber} and is_free='1')
|
||||
</update>
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -624,19 +624,17 @@
|
|||
AND bp.id in (SELECT pro_id FROM bns_smz_bm_sub_pro_relation WHERE sub_id = #{params.subId})
|
||||
</if>
|
||||
</if>
|
||||
<if test="params != null and params.size()>0">
|
||||
<if test="params.proId != null and params.proId !=''">
|
||||
and bp.id = #{params.proId}
|
||||
</if>
|
||||
<if test="params.keyWord !=null and params.keyWord !=''">
|
||||
and(
|
||||
bw.`NAME` like CONCAT('%',#{params.keyWord},'%') OR
|
||||
bw.ID_NUMBER like CONCAT('%',#{params.keyWord},'%') OR
|
||||
sdd.name like CONCAT('%',#{params.keyWord},'%') OR
|
||||
bwc.effectDate like CONCAT('%',#{params.keyWord},'%') OR
|
||||
bwc.contractType like CONCAT('%',#{params.keyWord},'%')
|
||||
)
|
||||
</if>
|
||||
<if test="params.proId != null and params.proId !=''">
|
||||
and bp.id = #{params.proId}
|
||||
</if>
|
||||
<if test="params.keyWord !=null and params.keyWord !=''">
|
||||
and(
|
||||
bw.`NAME` like CONCAT('%',#{params.keyWord},'%') OR
|
||||
bw.ID_NUMBER like CONCAT('%',#{params.keyWord},'%') OR
|
||||
sdd.name like CONCAT('%',#{params.keyWord},'%') OR
|
||||
bwc.effectDate like CONCAT('%',#{params.keyWord},'%') OR
|
||||
bwc.contractType like CONCAT('%',#{params.keyWord},'%')
|
||||
)
|
||||
</if>
|
||||
and bw.IS_ACTIVE = '1'
|
||||
having 1 ORDER BY upload_time DESC
|
||||
|
|
@ -644,10 +642,8 @@
|
|||
GROUP BY aa.ID_NUMBER
|
||||
) r
|
||||
<where>
|
||||
<if test="params != null and params.size()>0">
|
||||
<if test="params.contractStatus != null and params.contractStatus !=''">
|
||||
and r.stauts = #{params.contractStatus}
|
||||
</if>
|
||||
<if test="params.contractStatus != null and params.contractStatus !=''">
|
||||
and r.stauts = #{params.contractStatus}
|
||||
</if>
|
||||
</where>
|
||||
</select>
|
||||
|
|
|
|||
|
|
@ -4,14 +4,14 @@
|
|||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.bonus.hnrn.rnbmw.person.dao.GeneratePayrollDao">
|
||||
<select id="getPayrollList" resultType="com.bonus.hnrn.rnbmw.person.entity.GeneratePayrollBean">
|
||||
select bsb.id ,
|
||||
bsb.name ,
|
||||
bsb.start_time ,
|
||||
bsb.end_time ,
|
||||
bsb.creator ,
|
||||
bsb.create_time ,
|
||||
bsb.people_num ,
|
||||
bsb.salary_total ,
|
||||
select bsb.id as id,
|
||||
bsb.name as name,
|
||||
bsb.start_time as startTime ,
|
||||
bsb.end_time as endTime ,
|
||||
bsb.creator as creator ,
|
||||
bsb.create_time as createTime ,
|
||||
bsb.people_num as peopleNum ,
|
||||
bsb.salary_total as salaryTotal ,
|
||||
bp.name as proName,
|
||||
pc.org_name as companyName
|
||||
from bns_smz_bm_salary_book bsb
|
||||
|
|
@ -58,21 +58,21 @@
|
|||
</select>
|
||||
|
||||
<select id="getAll" resultType="com.bonus.hnrn.rnbmw.person.entity.GeneratePayrollBean">
|
||||
select sbd.id_number ,
|
||||
select sbd.id_number as idNumber,
|
||||
sbd.name as personName,
|
||||
sbd.bank_number ,
|
||||
sbd.bank_name ,
|
||||
sbd.bank_brank ,
|
||||
sbd.payable_amount ,
|
||||
sbd.payin_amount ,
|
||||
sbd.pay_date ,
|
||||
sbd.pay_month ,
|
||||
sbd.is_reissue ,
|
||||
sbd.work_days ,
|
||||
sbd.finance_sure ,
|
||||
sbd.person_sure ,
|
||||
sbd.submit_no ,
|
||||
sbd.bank_handleno
|
||||
sbd.bank_number as bankNumber,
|
||||
sbd.bank_name as bankName ,
|
||||
sbd.bank_brank as bankBrank,
|
||||
sbd.payable_amount as payableAmount ,
|
||||
sbd.payin_amount as payinAmount,
|
||||
sbd.pay_date as payDate,
|
||||
sbd.pay_month as payMonth,
|
||||
sbd.is_reissue as isReissue ,
|
||||
sbd.work_days as workDays ,
|
||||
sbd.finance_sure as financeSure ,
|
||||
sbd.person_sure as personSure ,
|
||||
sbd.submit_no as submitNo,
|
||||
sbd.bank_handleno as bankHandleno
|
||||
from bns_smz_bm_salary_book_details sbd
|
||||
where sbd.salary_id = #{params.id}
|
||||
<if test="params.keyWord != null and params.keyWord != ''">
|
||||
|
|
@ -85,21 +85,21 @@
|
|||
</select>
|
||||
|
||||
<select id="getPersonInfo" resultType="com.bonus.hnrn.rnbmw.person.entity.GeneratePayrollBean">
|
||||
select sbd.id_number ,
|
||||
select sbd.id_number as idNumber,
|
||||
sbd.name as personName,
|
||||
sbd.bank_number ,
|
||||
sbd.bank_name ,
|
||||
sbd.bank_brank ,
|
||||
sbd.payable_amount ,
|
||||
sbd.payin_amount ,
|
||||
sbd.pay_date ,
|
||||
sbd.pay_month ,
|
||||
sbd.is_reissue ,
|
||||
sbd.work_days ,
|
||||
sbd.finance_sure ,
|
||||
sbd.person_sure ,
|
||||
sbd.submit_no ,
|
||||
sbd.bank_handleno
|
||||
sbd.bank_number as bankNumber,
|
||||
sbd.bank_name as bankName,
|
||||
sbd.bank_brank as bankBrank,
|
||||
sbd.payable_amount as payableAmount ,
|
||||
sbd.payin_amount as payinAmount,
|
||||
sbd.pay_date as payDate ,
|
||||
sbd.pay_month as payMonth ,
|
||||
sbd.is_reissue as isReissue ,
|
||||
sbd.work_days as workDays ,
|
||||
sbd.finance_sure as financeSure ,
|
||||
sbd.person_sure as personSure,
|
||||
sbd.submit_no as submitNo ,
|
||||
sbd.bank_handleno as bankHandleno
|
||||
from bns_smz_bm_salary_book_details sbd
|
||||
where sbd.salary_id = #{id} and sbd.id_number = #{idNumber}
|
||||
</select>
|
||||
|
|
@ -492,23 +492,23 @@
|
|||
</select>
|
||||
|
||||
<select id="exportPayrollInfo" resultType="com.bonus.hnrn.rnbmw.person.entity.GeneratePayrollBean">
|
||||
select sbd.id_number ,
|
||||
select sbd.id_number as idNumber,
|
||||
sbd.name as personName,
|
||||
sbd.bank_number ,
|
||||
sbd.bank_name ,
|
||||
sbd.bank_brank ,
|
||||
sbd.payable_amount ,
|
||||
sbd.payin_amount ,
|
||||
sbd.pay_date ,
|
||||
sbd.pay_month ,
|
||||
sbd.is_reissue ,
|
||||
sbd.work_days ,
|
||||
sbd.finance_sure ,
|
||||
sbd.person_sure ,
|
||||
sbd.submit_no ,
|
||||
sbd.bank_handleno ,
|
||||
bsb.start_time ,
|
||||
bsb.end_time ,
|
||||
sbd.bank_number as bankNumber ,
|
||||
sbd.bank_name as bankName ,
|
||||
sbd.bank_brank as bankBrank ,
|
||||
sbd.payable_amount as payableAmount ,
|
||||
sbd.payin_amount as payinAmount,
|
||||
sbd.pay_date as payDate ,
|
||||
sbd.pay_month as payMonth ,
|
||||
sbd.is_reissue as isReissue ,
|
||||
sbd.work_days as workDays,
|
||||
sbd.finance_sure as financeSure,
|
||||
sbd.person_sure as personSure,
|
||||
sbd.submit_no as submitNo,
|
||||
sbd.bank_handleno as bankHandleno,
|
||||
bsb.start_time as startTime,
|
||||
bsb.end_time as endTime,
|
||||
bp.`name` proName
|
||||
from bns_smz_bm_salary_book_details sbd
|
||||
LEFT JOIN bns_smz_bm_salary_book bsb on bsb.id = sbd.salary_id
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.bonus.hnrn.rnbmw.person.dao.PersonTrainDao">
|
||||
<delete id="delWorkerPostById">
|
||||
UPDATE `bm_worker_train` SET `is_active` = '0' WHERE `id` = #{id}
|
||||
UPDATE bns_smz_bm_worker_train SET `is_active` = '0' WHERE `id` = #{id}
|
||||
</delete>
|
||||
|
||||
|
||||
|
|
@ -44,7 +44,7 @@
|
|||
</insert>
|
||||
|
||||
<insert id="insertList">
|
||||
INSERT INTO `bm_worker_train` (unit,name,id_Number,post_name,phone,train_name,totalStudytime,trainStudytime,examScore,create_time,is_active)
|
||||
INSERT INTO bns_smz_bm_worker_train (unit,name,id_Number,post_name,phone,train_name,totalStudytime,trainStudytime,examScore,create_time,is_active)
|
||||
values
|
||||
<foreach item="params" collection="list" separator=",">
|
||||
(#{params.unit}, #{params.name}, #{params.idNumber}, #{params.postName}, #{params.phone},#{params.trainName},#{params.totalStudytime},#{params.trainStudytime},#{params.examScore},now(),'1')
|
||||
|
|
@ -52,7 +52,7 @@
|
|||
</insert>
|
||||
|
||||
<update id="updateWorkerPost">
|
||||
UPDATE `bm_worker_train` SET `unit` = #{unit}, `name` = #{name},
|
||||
UPDATE bns_smz_bm_worker_train SET `unit` = #{unit}, `name` = #{name},
|
||||
`id_Number` = #{idNumber}, `post_name` = #{postName}, `phone` = #{phone}, `train_name` = #{trainName},`totalStudytime` = #{totalStudytime},`trainStudytime` = #{trainStudytime},`examScore` = #{examScore},`update_time` = now() WHERE `id` = #{id}
|
||||
</update>
|
||||
|
||||
|
|
|
|||
|
|
@ -215,12 +215,12 @@
|
|||
|
||||
<!--新增-->
|
||||
<insert id="addRedlist" parameterType="com.bonus.hnrn.rnbmw.person.entity.RedListBean">
|
||||
INSERT INTO `bm_redlist_worker` (company_id,`name`, `id_number`, `phone`, `post`, `remark`,sub_name, pro_name,add_time)
|
||||
INSERT INTO bns_smz_bm_redlist_worker (company_id,`name`, `id_number`, `phone`, `post`, `remark`,sub_name, pro_name,add_time)
|
||||
VALUES (#{companyId} , #{name}, #{idNumber}, #{phone}, #{post}, #{remark},#{subName},#{proName},now())
|
||||
</insert>
|
||||
|
||||
<insert id="insertList">
|
||||
insert into `bm_redlist_worker`
|
||||
insert into bns_smz_bm_redlist_worker
|
||||
(`company_id`,`name`, `id_number`, `phone`,`remark`,`add_time`,`post`,`sub_name`,`pro_name`)
|
||||
values
|
||||
<foreach item="params" collection="list" separator=",">
|
||||
|
|
@ -233,7 +233,7 @@
|
|||
</update>
|
||||
|
||||
<update id="updateGive">
|
||||
UPDATE `bm_worker_give` SET `is_active`='0' WHERE id_number = #{idNumber}
|
||||
UPDATE bns_smz_bm_worker_give SET `is_active`='0' WHERE id_number = #{idNumber}
|
||||
</update>
|
||||
|
||||
<!--获取满足点赞条件的人员身份证号-->
|
||||
|
|
|
|||
|
|
@ -1105,15 +1105,15 @@
|
|||
</insert>
|
||||
|
||||
<sql id="getHistoryRef">
|
||||
SELECT jrh.reword_num,
|
||||
jrh.submitter_id,
|
||||
SELECT jrh.reword_num as rewordNum,
|
||||
jrh.submitter_id as submitterId,
|
||||
su.username as submitterName,
|
||||
su.PHONE as userPhone,
|
||||
sr.name as roleName,
|
||||
jrh.submit_time,
|
||||
jrh.flow_node,
|
||||
jrh.audit_result,
|
||||
jrh.audit_remark
|
||||
jrh.submit_time as submitTime,
|
||||
jrh.flow_node as flowNode,
|
||||
jrh.audit_result as auditResult,
|
||||
jrh.audit_remark as auditRemark
|
||||
FROM bns_smz_jx_record_history jrh
|
||||
LEFT JOIN bns_smz_sys_user su on jrh.submitter_id = su.ID
|
||||
LEFT JOIN bns_smz_sys_role sr on sr.id = su.ROLE_ID
|
||||
|
|
|
|||
Loading…
Reference in New Issue