diff --git a/modules/bmw/src/main/java/com/bonus/bmw/basic/dao/UserDao.java b/modules/bmw/src/main/java/com/bonus/bmw/basic/dao/UserDao.java index 83d3f19..9299cc6 100644 --- a/modules/bmw/src/main/java/com/bonus/bmw/basic/dao/UserDao.java +++ b/modules/bmw/src/main/java/com/bonus/bmw/basic/dao/UserDao.java @@ -12,7 +12,7 @@ import java.util.Map; public interface UserDao { @Insert("insert into \"ynrealname\".\"sys_user\"(\"username\", \"password\", \"nickname\", \"headImgUrl\", \"phone\", \"telephone\", \"email\", \"birthday\", \"sex\", \"status\", \"createTime\", \"updateTime\") values(#{username}, #{password}, #{nickname}, #{headImgUrl}, #{phone}, #{telephone}, #{email}, #{birthday}, #{sex}, #{status}, SYSDATE, SYSDATE)") - @SelectKey(statement = "SELECT IDENTITY_VAL_LOCAL()", keyProperty = "id", before = false, resultType = Long.class) + @SelectKey(statement = "SELECT @@IDENTITY", keyProperty = "id", before = false, resultType = Long.class) int save(SysUser user); UserBean getById(Long id); diff --git a/modules/bmw/src/main/java/com/bonus/bmw/person/dao/TDictDao.java b/modules/bmw/src/main/java/com/bonus/bmw/person/dao/TDictDao.java index 98e7b66..6d38aff 100644 --- a/modules/bmw/src/main/java/com/bonus/bmw/person/dao/TDictDao.java +++ b/modules/bmw/src/main/java/com/bonus/bmw/person/dao/TDictDao.java @@ -13,18 +13,18 @@ public interface TDictDao { List list(@Param("params")Map params, @Param("offset") Integer offset, @Param("limit") Integer limit); - @Options(useGeneratedKeys = true,keyProperty = "id") - @Insert("INSERT INTO `t_dict`(`value`, `type`, `IS_ACTIVE`) VALUES (#{value}, #{type}, '1')") + @SelectKey(statement = "SELECT @@IDENTITY", keyProperty = "id", before = false, resultType = Long.class) + @Insert("INSERT INTO \"ynrealname\".\"t_dict\"(\"value\", \"type\", \"is_active\") VALUES (#{value}, #{type}, '1')") int save(TDictBean o); TDictBean getById(Long id); int update(TDictBean o); - @Update("update `t_dict` set is_active = '0' where id = #{id}") + @Update("update \"ynrealname\".\"t_dict\" set \"is_active\" = '0' where \"id\" = #{id}") int delete(Long id); - @Select("SELECT id,`value` FROM `t_dict` where `value` = #{value} and `type` = #{type} and is_active = '1'") + @Select("SELECT \"id\",\"value\" FROM \"ynrealname\".\"t_dict\" where \"value\" = #{value} and \"type\" = #{type} and \"is_active\" = '1'") TDictBean getByName(TDictBean o); int updSpecial(TDictBean bean); diff --git a/modules/bmw/src/main/resources/mapper/person/BasePersonMapper.xml b/modules/bmw/src/main/resources/mapper/person/BasePersonMapper.xml index 31a078f..88e1531 100644 --- a/modules/bmw/src/main/resources/mapper/person/BasePersonMapper.xml +++ b/modules/bmw/src/main/resources/mapper/person/BasePersonMapper.xml @@ -87,8 +87,8 @@ update "ynrealname"."bm_certificate_read" set "id_number" = #{idNumber} where "id_number" = #{id}; update "ynrealname"."bm_worker_certificate" set "id_number" = #{idNumber} where "id_number" = #{id}; - update "ynrealname"."bm_worker_contract" set idCard = #{idNumber} where idCard = #{id}; - update "ynrealname"."bm_worker_contract_details" set id_card = #{idNumber} where id_card = #{id}; + update "ynrealname"."bm_worker_contract" set "id_card" = #{idNumber} where "id_card" = #{id}; + update "ynrealname"."bm_worker_contract_details" set "id_card" = #{idNumber} where "id_card" = #{id}; update "ynrealname"."bm_worker_contract_witness" set "id_number" = #{idNumber} where "id_number" = #{id}; update "ynrealname"."bm_worker_ein_history" set "id_number" = #{idNumber} where "id_number" = #{id}; update "ynrealname"."bm_worker_give" set "id_number" = #{idNumber} where "id_number" = #{id}; @@ -96,9 +96,9 @@ update "ynrealname"."bm_worker_payroll" set "id_number" = #{idNumber} where "id_number" = #{id}; update "ynrealname"."bm_worker_photo" set "id_number" = #{idNumber} where "id_number" = #{id}; update "ynrealname"."bm_worker_train" set "id_number" = #{idNumber} where "id_number" = #{id}; - update "ynrealname"."bm_sub_team" set team_Idnumber = #{idNumber} where team_Idnumber = #{id}; + update "ynrealname"."bm_sub_team" set "team_idnumber" = #{idNumber} where "team_idnumber" = #{id}; update "ynrealname"."bm_team_user_relation" set "id_number" = #{idNumber} where "id_number" = #{id}; - update "ynrealname"."fc_face_contrast" set ID_NUMBER = #{idNumber} where ID_NUMBER = #{id} + update "ynrealname"."fc_face_contrast" set "id_number" = #{idNumber} where "id_number" = #{id} @@ -121,39 +121,39 @@ @@ -175,8 +175,8 @@ bw."expiry_date" AS expiryDate, bw."post_id" AS postId, bw."phone", - bwp.BANK_NAME AS bankName, - bwp.BANK_CARD AS bankCard, + bwp."bank_name" AS bankName, + bwp."bank_card" AS bankCard, bw."person_type" AS personType, bw."worker_skill" AS workerSkill, bw."urgent_person" AS urgentPerson, @@ -188,11 +188,11 @@ bw."address_phone" as addressPhone FROM "ynrealname"."bm_worker" bw - LEFT JOIN "ynrealname"."bm_worker_bank" bwp ON bw.id_number = bwp.ID_NUMBER - AND bwp.is_active = '1' + LEFT JOIN "ynrealname"."bm_worker_bank" bwp ON bw."id_number" = bwp."id_number" + AND bwp."is_active" = '1' WHERE - bw.is_active = '1' - AND bw.id_number = #{idNumber} + bw."is_active" = '1' + AND bw."id_number" = #{idNumber} diff --git a/modules/bmw/src/main/resources/mapper/person/DictMapper.xml b/modules/bmw/src/main/resources/mapper/person/DictMapper.xml index 1384e7f..4234d24 100644 --- a/modules/bmw/src/main/resources/mapper/person/DictMapper.xml +++ b/modules/bmw/src/main/resources/mapper/person/DictMapper.xml @@ -4,14 +4,14 @@ - where IS_ACTIVE = '1' + where "is_active" = '1' and "type" = #{params.type} and ( - "value" like concat('%', #{params.keyWord}, '%') - or "update_time" like concat('%', #{params.keyWord}, '%') + "value" like '%' || #{params.keyWord} || '%' + or "update_time" like '%' || #{params.keyWord} || '%' ) diff --git a/modules/bmw/src/main/resources/mapper/person/PersonCertificateMapper.xml b/modules/bmw/src/main/resources/mapper/person/PersonCertificateMapper.xml index 0d4612d..e64d56a 100644 --- a/modules/bmw/src/main/resources/mapper/person/PersonCertificateMapper.xml +++ b/modules/bmw/src/main/resources/mapper/person/PersonCertificateMapper.xml @@ -5,61 +5,61 @@ - INSERT INTO `bm_certificate_type` ( NAME, is_upload, remark,is_active) + INSERT INTO "ynrealname"."bm_certificate_type" ( "name", "is_upload", "remark","is_active") VALUES(#{name},#{isUpload},#{remark},'1') - insert into bm_certificate_post(certificate_id,post_id) + insert into "ynrealname"."bm_certificate_post"("certificate_id","post_id") values (#{param.certificateId},#{param.postId}) - INSERT INTO `bm_worker_certificate`(`id_number`, `certificate_id`, certificate_file, certificate_type_file, `start_date`, `stop_date`, `is_active`,examine_status,upload_user_id) + INSERT INTO "ynrealname"."bm_worker_certificate"("id_number", "certificate_id", "certificate_file", "certificate_type_file", "start_date", "stop_date", "is_active","examine_status","upload_user_id") VALUES ( #{idNumber}, #{certificateId}, #{certificateFile}, #{certificateTypeFile}, #{startDate}, #{stopDate}, '1','0',#{uploadUserId}); - UPDATE `bm_certificate_type` - SET NAME = #{name} + UPDATE "ynrealname"."bm_certificate_type" + SET "name" = #{name} WHERE - id = #{id} + "id" = #{id} - update `bm_worker_certificate` set - `certificate_id` = #{certificateId}, + update "ynrealname"."bm_worker_certificate" set + "certificate_id" = #{certificateId}, - certificate_file = #{certificateFile}, + "certificate_file" = #{certificateFile}, - certificate_type_file = #{certificateTypeFile}, + "certificate_type_file" = #{certificateTypeFile}, - `start_date` = #{startDate}, - `stop_date` = #{stopDate}, - examine_status = '0', - examine_advice = NULL, - examine_person_id = NULL, - examine_time = NULL - WHERE `id` = #{id} and `is_active` = '1' + "start_date" = #{startDate}, + "stop_date" = #{stopDate}, + "examine_status" = '0', + "examine_advice" = NULL, + "examine_person_id" = NULL, + "examine_time" = NULL + WHERE "id" = #{id} and "is_active" = '1' - UPDATE `bm_certificate_type` SET - is_active = '0' + UPDATE "ynrealname"."bm_certificate_type" SET + "is_active" = '0' WHERE - id = #{id} + "id" = #{id} - delete from bm_certificate_post where post_id = #{postId} + delete from "ynrealname"."bm_certificate_post" where "post_id" = #{postId} - UPDATE `bm_worker_certificate` SET - is_active = '0' + UPDATE "ynrealname"."bm_worker_certificate" SET + "is_active" = '0' WHERE - id = #{id} + "id" = #{id} @@ -67,253 +67,258 @@ SELECT count(1) FROM - `bm_certificate_type` - WHERE is_active = '1' + "ynrealname"."bm_certificate_type" + WHERE "is_active" = '1' - and instr(name,#{params.keyWord}) > 0 + and INSTR("name",#{params.keyWord}) > 0 @@ -506,166 +514,165 @@ select * from ( SELECT count(1) FROM - bm_worker_certificate bwc - LEFT JOIN bm_worker bw ON bw.ID_NUMBER = bwc.ID_NUMBER - LEFT JOIN t_dict sdd ON sdd.id = bw.POST_ID - AND sdd.type = 'postType' - LEFT JOIN bm_certificate_type bct ON bwc.certificate_id = bct.id - LEFT JOIN sys_user su ON su.id = bwc.examine_person_id AND su.is_active = '1' - LEFT JOIN bm_team_user_relation btur ON btur.id_number = bw.id_number AND btur.is_active = '1' - LEFT JOIN bm_sub_team bst ON bst.id = btur.team_id AND bst.is_active = '1' - LEFT JOIN bm_subcontractor bs ON bs.id = bst.sub_id AND bs.is_active = '1' - LEFT JOIN sys_user su1 ON su1.id = bwc.upload_user_id AND su1.is_active = '1' + "ynrealname"."bm_worker_certificate" bwc + LEFT JOIN "ynrealname"."bm_worker" bw ON bw."id_number" = bwc."id_number" + LEFT JOIN "ynrealname"."t_dict" sdd ON sdd."id" = bw."post_id" + AND sdd."type" = 'postType' + LEFT JOIN "ynrealname"."bm_certificate_type" bct ON bwc."certificate_id" = bct."id" + LEFT JOIN "ynrealname"."sys_user" su ON su."id" = bwc."examine_person_id" AND su."is_active" = '1' + LEFT JOIN "ynrealname"."bm_team_user_relation" btur ON btur."id_number" = bw."id_number" AND btur."is_active" = '1' + LEFT JOIN "ynrealname"."bm_sub_team" bst ON bst."id" = btur."team_id" AND bst."is_active" = '1' + LEFT JOIN "ynrealname"."bm_subcontractor" bs ON bs."id" = bst."sub_id" AND bs."is_active" = '1' + LEFT JOIN "ynrealname"."sys_user" su1 ON su1."id" = bwc."upload_user_id" AND su1."is_active" = '1' WHERE - bwc.is_active = '1' + bwc."is_active" = '1' - AND bct.id = #{params.certificateId} + AND bct."id" = #{params.certificateId} - and now() BETWEEN bwc.start_date AND bwc.stop_date = '1' - and TO_DAYS(bwc.stop_date) - TO_DAYS(now()) > 60 + and (SYSDATE BETWEEN bwc."start_date" AND bwc."stop_date") + and (bwc."stop_date" - SYSDATE) > 60 - and now() BETWEEN bwc.start_date AND bwc.stop_date = '1' - and TO_DAYS(bwc.stop_date) - TO_DAYS(now()) <= 60 + and (SYSDATE BETWEEN bwc."start_date" AND bwc."stop_date") + and (bwc."stop_date" - SYSDATE) <= 60 - and now() BETWEEN bwc.start_date AND bwc.stop_date = '0' + and NOT (SYSDATE BETWEEN bwc."start_date" AND bwc."stop_date") and ( - bw.NAME like CONCAT('%',#{params.keyWord},'%') - or bs.sub_name like CONCAT('%',#{params.keyWord},'%') - or bw.id_number like CONCAT('%',#{params.keyWord},'%') + bw."name" like '%' || #{params.keyWord} || '%' + or bs."sub_name" like '%' || #{params.keyWord} || '%' + or bw."id_number" like '%' || #{params.keyWord} || '%' ) - update bm_worker_certificate set - examine_status = #{examineStatus} - ,examine_person_id = #{examinePersonId} - ,examine_time = now() + update "ynrealname"."bm_worker_certificate" set + "examine_status" = #{examineStatus} + , "examine_person_id" = #{examinePersonId} + , "examine_time" = SYSDATE - ,examine_advice = #{examineAdvice} + , "examine_advice" = #{examineAdvice} - WHERE `id` = #{certificateId} + WHERE "id" = #{certificateId} - SELECT subId, - count( - IF( - now() BETWEEN aa.start_date - AND aa.stop_date = '1' - AND TO_DAYS( aa.stop_date ) - TO_DAYS( - now()) <= 60, - 1, - null) - ) warnCertificateTotal, - count(IF( now() BETWEEN aa.start_date AND aa.stop_date = '0', 1, null )) expireCertificateTotal + SUM(CASE WHEN (SYSDATE BETWEEN aa."start_date" AND aa."stop_date") AND (aa."stop_date" - SYSDATE) <= 60 THEN 1 ELSE 0 END) AS warnCertificateTotal, + SUM(CASE WHEN NOT (SYSDATE BETWEEN aa."start_date" AND aa."stop_date") THEN 1 ELSE 0 END) AS expireCertificateTotal FROM ( SELECT - bst.id, - bwc.start_date,bwc.stop_date, - IF - ( bst.sub_id IS NULL, '', bst.sub_id ) AS subId, - now( ) BETWEEN bwc.start_date - AND bwc.stop_date AS `status` + bst."id", + bwc."start_date",bwc."stop_date", + CASE WHEN bst."sub_id" IS NULL THEN '' ELSE bst."sub_id" END AS subId, + CASE WHEN SYSDATE BETWEEN bwc."start_date" AND bwc."stop_date" THEN 1 ELSE 0 END AS "status" FROM - bm_worker_certificate bwc - LEFT JOIN bm_team_user_relation btur ON bwc.ID_NUMBER = btur.ID_NUMBER AND btur.is_active = '1' - LEFT JOIN bm_sub_team bst ON bst.id = btur.team_id AND btur.is_active = '1' + "ynrealname"."bm_worker_certificate" bwc + LEFT JOIN "ynrealname"."bm_team_user_relation" btur ON bwc."id_number" = btur."id_number" AND btur."is_active" = '1' + LEFT JOIN "ynrealname"."bm_sub_team" bst ON bst."id" = btur."team_id" AND btur."is_active" = '1' WHERE - bwc.is_active = '1' AND bwc.examine_status = '1' + bwc."is_active" = '1' AND bwc."examine_status" = '1' ) aa GROUP BY subId - - \ No newline at end of file diff --git a/modules/bmw/src/main/resources/mapper/person/WorkTypeCertificateConfigMapper.xml b/modules/bmw/src/main/resources/mapper/person/WorkTypeCertificateConfigMapper.xml index 35f9a0a..bc3755a 100644 --- a/modules/bmw/src/main/resources/mapper/person/WorkTypeCertificateConfigMapper.xml +++ b/modules/bmw/src/main/resources/mapper/person/WorkTypeCertificateConfigMapper.xml @@ -3,8 +3,12 @@ - MERGE INTO "ynrealname"."bm_certificate_post"("post_id","certificate_id") - VALUES (#{name}, #{proName}) + MERGE INTO "ynrealname"."bm_certificate_post" t + USING dual + ON (t."post_id" = #{name} AND t."certificate_id" = #{proName}) + WHEN NOT MATCHED THEN + INSERT ("post_id", "certificate_id") + VALUES (#{name}, #{proName});