Merge remote-tracking branch 'origin/main'

real-name/src/main/java/com/bonus/hnrn/rnbmw/manager/dao/RoleDao.java

@@ -29,7 +29,7 @@ public interface RoleDao {
 	@Select("select * from bns_smz_sys_role t where t.name = #{name} and t.company_id = #{companyId} and is_active = 1")
 	Role getRole(String name,String companyId);
 
-	@Select("select su.id from bns_smz_sys_role_user t left join sys_user su on su.ID =t.userId where t.roleId = #{roleId} and su.IS_ACTIVE = 1")
+	@Select("select su.id from bns_smz_sys_role_user t left join bns_smz_sys_user su on su.ID =t.userId where t.roleId = #{roleId} and su.IS_ACTIVE = 1")
 	Role getUserRole(Long roleId);
 
 

real-name/src/main/java/com/bonus/hnrn/rnbmw/ownPerson/controller/AnnouncementController.java

@@ -2,6 +2,7 @@ package com.bonus.hnrn.rnbmw.ownPerson.controller;
 
 import com.bonus.hnrn.rnbmw.basic.controller.ProjectController;
 import com.bonus.hnrn.rnbmw.basic.entity.SalaryPaymentAndAttendanceRecordsBean;
+import com.bonus.hnrn.rnbmw.file.UploadService;
 import com.bonus.hnrn.rnbmw.manager.annotation.LogAnnotation;
 import com.bonus.hnrn.rnbmw.manager.model.SysUser;
 import com.bonus.hnrn.rnbmw.manager.table.PageTableHandler;
@@ -42,6 +43,9 @@ public class AnnouncementController {
     @Resource(name = "AnnouncementService")
     private AnnouncementService service;
 
+    @Resource
+    private UploadService uploadService;
+
     @GetMapping
     @ApiOperation(value = "自有人员-通知公告-列表")
     @PreAuthorize("hasAuthority('sys:Announcement:query')")
@@ -153,7 +157,7 @@ public class AnnouncementController {
 
         List<MultipartFile> items = (List<MultipartFile>) map.get("filePath");
         logger.error("items==" + items.size());
-        for (int i = 0; i < items.size(); i++) {
+        /*for (int i = 0; i < items.size(); i++) {
             MultipartFile item = items.get(i);
             String tmpName = item.getOriginalFilename();// 完整路径 IE
             if (StringHelper.isEmpty(tmpName)) {
@@ -190,7 +194,36 @@ public class AnnouncementController {
                 ar.setFailMsg(GlobalConst.SAVE_FAIL);
             }
         }
-        ar.setSucceed(urlStr, GlobalConst.UPLOAD_SUCCEED);
+        ar.setSucceed(urlStr, GlobalConst.UPLOAD_SUCCEED);*/
+
+
+        for (int i = 0; i < items.size(); i++) {
+            MultipartFile item = items.get(i);
+            String tmpName = item.getOriginalFilename();// 完整路径 IE
+            if (StringHelper.isEmpty(tmpName)) {
+                return null; // 根据情况
+            }
+            try {
+                Map<String,String> resultMap=uploadService.uploadSingFile(item,"smz/idcard");
+                urlStr.add(resultMap.get("url"));
+            } catch (Exception e) {
+                logger.error(e.toString(), e);
+                ar.setFailMsg(GlobalConst.SAVE_FAIL);
+            }
+        }
+
+        int result = 0;
+        AnnouncementBean bean = new AnnouncementBean();
+        String fileName = DateTimeHelper.getNowDate().replace("-", "") + "_" + generateShortUuid() + "_" + "broadFile";
+        bean.setPid(vo.getId());
+        bean.setFileName(fileName);//文件名
+        bean.setFilePath(urlStr.get(0));//路径
+        result = service.saveFile(bean);
+        if(result==1){
+            ar.setSucceed(urlStr, GlobalConst.UPLOAD_SUCCEED);
+        }else {
+            ar.setFailMsg(GlobalConst.SAVE_FAIL);
+        }
         return ar;
     }
 

real-name/src/main/java/com/bonus/hnrn/rnbmw/ownPerson/controller/WorkerBenefitsController.java

@@ -1,5 +1,6 @@
 package com.bonus.hnrn.rnbmw.ownPerson.controller;
 
+import com.bonus.hnrn.rnbmw.file.UploadService;
 import com.bonus.hnrn.rnbmw.manager.annotation.LogAnnotation;
 import com.bonus.hnrn.rnbmw.manager.dao.UserDao;
 import com.bonus.hnrn.rnbmw.manager.model.SysUser;
@@ -37,6 +38,9 @@ public class WorkerBenefitsController {
     @Resource(name = "userDao")
     private UserDao userdao;
 
+    @Resource
+    private UploadService uploadService;
+
     @GetMapping
     @ApiOperation(value = "自有人员-待遇申报-列表")
     @PreAuthorize("hasAuthority('sys:workerBenefits:query')")
@@ -107,18 +111,22 @@ public class WorkerBenefitsController {
         WorkerBenefitsBean bean = new  WorkerBenefitsBean();
         List<WorkerBenefitsBean> list ;
         String reportPath = "";
+        String reportPaths = "";
         try {
             list = service.getWorkerBenefitsById(id);
             if(list.size()>0){
                 for (int i = 0; i < list.size(); i++) {
                     if(i == list.size()-1){
-                        reportPath +=list.get(i).getReportPath();
+                        reportPath +=uploadService.getPresignedUrl(list.get(i).getReportPath());
+                        reportPaths +=list.get(i).getReportPath();
 //                        bean.setReportPath(list.get(i).getReportPath());
                     }else{
-                        reportPath +=list.get(i).getReportPath()+",";
+                        reportPath +=uploadService.getPresignedUrl(list.get(i).getReportPath())+",";
+                        reportPaths +=list.get(i).getReportPath()+",";
 //                        bean.setReportPath(list.get(i).getReportPath()+",");
                     }
                 }
+                bean.setReportPaths(reportPaths);
                 bean.setReportPath(reportPath);
                 bean.setId(list.get(0).getId());
                 bean.setReportType(list.get(0).getReportType());
@@ -138,6 +146,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 {
@@ -158,7 +174,22 @@ public class WorkerBenefitsController {
         List<String> urlStr = new LinkedList<>();
         CommonsMultipartResolver multipartResolver = new CommonsMultipartResolver();
         List<MultipartFile> items = (List<MultipartFile>) map.get("filePath");
-        try {
+        for (int i = 0; i < items.size(); i++) {
+            MultipartFile item = items.get(i);
+            String tmpName = item.getOriginalFilename();// 完整路径 IE
+            if (StringHelper.isEmpty(tmpName)) {
+                return null; // 根据情况
+            }
+            try {
+                Map<String,String> resultMap=uploadService.uploadSingFile(item,"smz/idcard");
+                urlStr.add(resultMap.get("url"));
+            } catch (Exception e) {
+                logger.error(e.toString(), e);
+                ar.setFailMsg(GlobalConst.SAVE_FAIL);
+            }
+        }
+
+        /*try {
             for (MultipartFile item:items) {
                 String tmpName = item.getOriginalFilename();// 完整路径 IE
                 if (StringHelper.isEmpty(tmpName)) {
@@ -193,7 +224,19 @@ public class WorkerBenefitsController {
             e.printStackTrace();
             ar.setSucceedMsg(GlobalConst.SAVE_FAIL);
         }
-        ar.setSucceed(urlStr, GlobalConst.UPLOAD_SUCCEED);
+        ar.setSucceed(urlStr, GlobalConst.UPLOAD_SUCCEED);*/
+        int result = 0;
+        bean.setReportPath(urlStr.get(0));
+        bean.setPId(bean.getId());
+        String fileName = DateTimeHelper.getNowDate().replace("-", "") + "_" + generateShortUuid() + "_" + "broadFile";
+        bean.setReportName(fileName);//文件名
+        result= service.saveFileType(bean);
+        if(result==1){
+            ar.setSucceed(urlStr, GlobalConst.UPLOAD_SUCCEED);
+        }else {
+            ar.setFailMsg(GlobalConst.SAVE_FAIL);
+        }
+
         return ar;
     }
 

real-name/src/main/java/com/bonus/hnrn/rnbmw/ownPerson/dao/AnnouncementDao.java

@@ -14,7 +14,7 @@ public interface AnnouncementDao {
 
     List<AnnouncementBean> getList(@Param("params")Map<String, Object> params, @Param("offset")Integer offset, @Param("limit")Integer limit);
 
-    void saveFile(AnnouncementBean bean);
+    int saveFile(AnnouncementBean bean);
 
     int addAnnouncement(AnnouncementBean bean);
 

real-name/src/main/java/com/bonus/hnrn/rnbmw/ownPerson/dao/WorkerBenefitsDao.java

@@ -26,9 +26,11 @@ public interface WorkerBenefitsDao {
 
     int updateBenefits(WorkerBenefitsBean bean);
 
-    void saveFileType(WorkerBenefitsBean bean);
+    int saveFileType(WorkerBenefitsBean bean);
 
     int deleteBenefits(String id);
 
     List<WorkerBenefitsBean> getWorkerBenefitsById(String id);
+
+    void delImg(String delImg);
 }

real-name/src/main/java/com/bonus/hnrn/rnbmw/ownPerson/entity/WorkerBenefitsBean.java

@@ -9,7 +9,10 @@ public class WorkerBenefitsBean extends WorkerBean {
     public String reportType; //申报类型  对应字典表ID
     public String reportDate; //申报日期
     public String reportPath; //相关资料 图片路径
+    public String reportPaths; //相关资料 图片路径
     public String reportName; //相关资料 图片名称
     public String remark; //备注
 
+    public String delImg;// 删除的图片路径
+
 }

real-name/src/main/java/com/bonus/hnrn/rnbmw/ownPerson/service/AnnouncementService.java

@@ -10,7 +10,7 @@ public interface AnnouncementService {
 
     List<AnnouncementBean> getList(Map<String, Object> params, Integer offset, Integer limit);
 
-    void saveFile(AnnouncementBean bean);
+    int saveFile(AnnouncementBean bean);
 
     int addAnnouncement(AnnouncementBean bean);
 

real-name/src/main/java/com/bonus/hnrn/rnbmw/ownPerson/service/WorkerBenefitsService.java

@@ -19,9 +19,11 @@ public interface WorkerBenefitsService {
 
     int updateBenefits(WorkerBenefitsBean bean);
 
-    void saveFileType(WorkerBenefitsBean bean);
+    int saveFileType(WorkerBenefitsBean bean);
 
     int deleteBenefits(String id);
 
     List<WorkerBenefitsBean> getWorkerBenefitsById(String id);
+
+    void delImg(String delImg);
 }

real-name/src/main/java/com/bonus/hnrn/rnbmw/ownPerson/service/impl/AnnouncementServiceImpl.java

@@ -1,7 +1,9 @@
 package com.bonus.hnrn.rnbmw.ownPerson.service.impl;
 
+import com.bonus.hnrn.rnbmw.file.UploadService;
 import com.bonus.hnrn.rnbmw.ownPerson.dao.AnnouncementDao;
 import com.bonus.hnrn.rnbmw.ownPerson.entity.AnnouncementBean;
+import com.bonus.hnrn.rnbmw.ownPerson.entity.WorkerBenefitsBean;
 import com.bonus.hnrn.rnbmw.ownPerson.service.AnnouncementService;
 import com.bonus.hnrn.rnbmw.person.dao.PersonTrainDao;
 import org.springframework.stereotype.Service;
@@ -15,6 +17,9 @@ public class AnnouncementServiceImpl implements AnnouncementService {
     @Resource(name = "AnnouncementDao")
     private AnnouncementDao dao;
 
+    @Resource
+    private UploadService uploadService;
+
     @Override
     public int getCount(Map<String, Object> params) {
         return dao.getCount(params);
@@ -26,8 +31,8 @@ public class AnnouncementServiceImpl implements AnnouncementService {
     }
 
     @Override
-    public void saveFile(AnnouncementBean bean) {
+    public int saveFile(AnnouncementBean bean) {
-        dao.saveFile(bean);
+        return dao.saveFile(bean);
     }
 
     @Override
@@ -47,6 +52,23 @@ public class AnnouncementServiceImpl implements AnnouncementService {
 
     @Override
     public List<AnnouncementBean> getDetailData(AnnouncementBean bean) {
-        return dao.getDetailData(bean);
+        List<AnnouncementBean> list = dao.getDetailData(bean);
+        if(list != null && list.size() > 0){
+            for(AnnouncementBean o : list){
+                if(o.getFilePath()!=null){
+                    if(o.getFilePath().contains("@")){
+                        String[] reportPath = o.getFilePath().split("@");
+                        String reportPathUrl = "";
+                        for(String path : reportPath){
+                            reportPathUrl = reportPathUrl + uploadService.getPresignedUrl(path) + "@";
+                        }
+                        o.setFilePath(reportPathUrl);
+                    }else{
+                        o.setFilePath(uploadService.getPresignedUrl(o.getFilePath()));
+                    }
+                }
+            }
+        }
+        return list;
     }
 }

real-name/src/main/java/com/bonus/hnrn/rnbmw/ownPerson/service/impl/WorkerBenefitsServiceImpl.java

@@ -1,5 +1,6 @@
 package com.bonus.hnrn.rnbmw.ownPerson.service.impl;
 
+import com.bonus.hnrn.rnbmw.file.UploadService;
 import com.bonus.hnrn.rnbmw.ownPerson.dao.WorkerBenefitsDao;
 import com.bonus.hnrn.rnbmw.ownPerson.entity.WorkerBenefitsBean;
 import com.bonus.hnrn.rnbmw.ownPerson.service.WorkerBenefitsService;
@@ -15,6 +16,9 @@ public class WorkerBenefitsServiceImpl implements WorkerBenefitsService {
     @Resource(name = "WorkerBenefitsDao")
     private WorkerBenefitsDao dao;
 
+    @Resource
+    private UploadService uploadService;
+
     @Override
     public List<WorkerBenefitsBean> getList(Map<String, Object> params, Integer offset, Integer limit) {
         return dao.getList(params,offset,limit);
@@ -32,7 +36,22 @@ public class WorkerBenefitsServiceImpl implements WorkerBenefitsService {
 
     @Override
     public List<WorkerBenefitsBean> getWorkerBenefitsList(Map<String, Object> params, Integer offset, Integer limit) {
-        return dao.getWorkerBenefitsList(params,offset,limit);
+        List<WorkerBenefitsBean> list = dao.getWorkerBenefitsList(params,offset,limit);
+        for(WorkerBenefitsBean bean : list){
+            if(bean.getReportPath()!=null){
+                if(bean.getReportPath().contains(",")){
+                    String[] reportPath = bean.getReportPath().split(",");
+                    String reportPathUrl = "";
+                    for(String path : reportPath){
+                        reportPathUrl = reportPathUrl + uploadService.getPresignedUrl(path) + ",";
+                    }
+                    bean.setReportPath(reportPathUrl);
+                }else{
+                    bean.setReportPath(uploadService.getPresignedUrl(bean.getReportPath()));
+                }
+            }
+        }
+        return list;
     }
 
     @Override
@@ -53,8 +72,8 @@ public class WorkerBenefitsServiceImpl implements WorkerBenefitsService {
     }
 
     @Override
-    public void saveFileType(WorkerBenefitsBean bean) {
+    public int saveFileType(WorkerBenefitsBean bean) {
-        dao.saveFileType(bean);
+        return dao.saveFileType(bean);
     }
 
     @Override
@@ -65,4 +84,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);
+    }
 }

real-name/src/main/resources/mappers/companyManager/CompanyManagerMapper.xml

@@ -171,15 +171,15 @@
     </select>
 
     <select id="getOrgId" resultType="java.lang.Integer">
-        SELECT count(*) FROM `bns_smz_pm_organization` WHERE  COMPANY_ID =  #{id} and is_active = '1' and TYPE !='1'
+        SELECT count(*) FROM bns_smz_pm_organization WHERE  COMPANY_ID =  #{id} and is_active = '1' and TYPE !='1'
     </select>
     <select id="getRoleId" resultType="java.lang.Integer">
-        SELECT count(*) FROM `bns_smz_sys_role` WHERE  COMPANY_ID =  #{id} and is_active = '1'
+        SELECT count(*) FROM bns_smz_sys_role WHERE  COMPANY_ID =  #{id} and is_active = '1'
     </select>
     <select id="getUserId" resultType="java.lang.Integer">
         SELECT count(*) FROM bns_smz_sys_user
         WHERE ORG_ID in(
-            SELECT id as orgId  FROM `bns_smz_pm_organization` WHERE  COMPANY_ID = #{id} and is_active = '1'
+            SELECT id as orgId  FROM bns_smz_pm_organization WHERE  COMPANY_ID = #{id} and is_active = '1'
         )
     </select>
 
@@ -195,19 +195,19 @@
 
     <!--公司新增role-->
     <insert id="insertRegisteRole" parameterType="com.bonus.hnrn.rnbmw.manager.entity.CompanyManagerBean" useGeneratedKeys="true" keyProperty="roleId" >
-        INSERT INTO `bns_smz_sys_role`( `name`, `company_id`,role_level, description ,`TYPE`, `createTime`, `updateTime`,`status`, `is_active`,is_free)
+        INSERT INTO bns_smz_sys_role( `name`, `company_id`,role_level, description ,`TYPE`, `createTime`, `updateTime`,`status`, `is_active`,is_free)
         VALUES ('公司管理员', #{id},'1', '公司管理-新增' , '1,2',CURRENT_TIMESTAMP(), CURRENT_TIMESTAMP(),'1', '1',#{isFree});
     </insert>
 
     <!--公司新增roleUser-->
     <insert id="insertRegisteRoleUser" >
-        INSERT INTO `sys_role_user`( `userId`, `roleId`)
+        INSERT INTO bns_smz_sys_role_user( `userId`, `roleId`)
         VALUES (#{userId}, #{roleId});
     </insert>
 
     <!--公司新增rolePermission-->
     <insert id="insertRegisterRolePermission" >
-        INSERT INTO `sys_role_permission`( `roleId`, `permissionId`)
+        INSERT INTO bns_smz_sys_role_permission( `roleId`, `permissionId`)
         VALUES (#{roleId}, #{id});
     </insert>
 

real-name/src/main/resources/mappers/ownPerson/WorkerBenefitsMapper.xml

@@ -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
+            FROM bns_smz_own_worker_benefits b
-            LEFT JOIN bns_smz_own_worker_benefits_file f ON b.id = f.pid
+            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
+        FROM bns_smz_own_worker_benefits b
-        LEFT JOIN bns_smz_own_worker_benefits_file f ON b.id = f.pid
+        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 != '' ">
@@ -162,9 +166,9 @@
     </select>
 
     <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
+        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
+        FROM bns_smz_own_worker_benefits b
-        LEFT JOIN bns_smz_own_worker_benefits_file f ON b.id = f.pid
+        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>

real-name/src/main/resources/mappers/person/BlacklistMapper.xml

@@ -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>
 
 

real-name/src/main/resources/mappers/person/ContractMapper.xml

@@ -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 !=''">
-            <if test="params.proId != null and params.proId !=''">
+            and bp.id = #{params.proId}
-                and bp.id = #{params.proId}
+        </if>
-            </if>
+        <if test="params.keyWord !=null and params.keyWord !=''">
-            <if test="params.keyWord !=null and params.keyWord !=''">
+            and(
-                and(
+            bw.`NAME` like CONCAT('%',#{params.keyWord},'%') OR
-                bw.`NAME` like CONCAT('%',#{params.keyWord},'%') OR
+            bw.ID_NUMBER like CONCAT('%',#{params.keyWord},'%') OR
-                bw.ID_NUMBER like CONCAT('%',#{params.keyWord},'%') OR
+            sdd.name like CONCAT('%',#{params.keyWord},'%') OR
-                sdd.name like CONCAT('%',#{params.keyWord},'%') OR
+            bwc.effectDate like CONCAT('%',#{params.keyWord},'%') OR
-                bwc.effectDate like CONCAT('%',#{params.keyWord},'%') OR
+            bwc.contractType like CONCAT('%',#{params.keyWord},'%')
-                bwc.contractType like CONCAT('%',#{params.keyWord},'%')
+            )
-                )
-            </if>
         </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 !=''">
-                <if test="params.contractStatus != null and params.contractStatus !=''">
+                and r.stauts = #{params.contractStatus}
-                    and r.stauts = #{params.contractStatus}
-                </if>
             </if>
         </where>
     </select>

real-name/src/main/resources/mappers/person/FaceContrastMapper.xml

@@ -13,7 +13,7 @@
         '后台补卡',#{addTime},'',#{makeCardReason},#{workHours},'','','1',#{isRepair})
     </insert>
     <update id="cancelAttendance">
-        update bns_smz_fc_face_contrast set AUDIT_STATUS = '4',remark = #{cancelCardReason} where id_number = #{idNumber} and current_day = #{currentDay} and is_active = '1'
+        update bns_smz_fc_face_contrast set AUDIT_STATUS = '4', WORK_HOURS ='0',remark = #{cancelCardReason} where id_number = #{idNumber} and current_day = #{currentDay} and is_active = '1'
     </update>
     <update id="delAttendance">
         update bns_smz_fc_face_contrast set is_active = '0' where id = #{id} and is_active = '1'

real-name/src/main/resources/mappers/person/GeneratePayrollMapper.xml

@@ -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 ,
+       select bsb.id as id,
-           bsb.name ,
+           bsb.name as name,
-           bsb.start_time ,
+           bsb.start_time as startTime ,
-           bsb.end_time ,
+           bsb.end_time  as endTime ,
-           bsb.creator ,
+           bsb.creator as creator ,
-           bsb.create_time ,
+           bsb.create_time as createTime ,
-           bsb.people_num ,
+           bsb.people_num as peopleNum ,
-           bsb.salary_total ,
+           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_number as bankNumber,
-            sbd.bank_name ,
+            sbd.bank_name as bankName ,
-            sbd.bank_brank ,
+            sbd.bank_brank as bankBrank,
-            sbd.payable_amount ,
+            sbd.payable_amount  as payableAmount ,
-            sbd.payin_amount ,
+            sbd.payin_amount as payinAmount,
-            sbd.pay_date ,
+            sbd.pay_date as payDate,
-            sbd.pay_month ,
+            sbd.pay_month as payMonth,
-            sbd.is_reissue ,
+            sbd.is_reissue as isReissue  ,
-            sbd.work_days ,
+            sbd.work_days as workDays ,
-            sbd.finance_sure ,
+            sbd.finance_sure as financeSure ,
-            sbd.person_sure ,
+            sbd.person_sure as personSure ,
-            sbd.submit_no ,
+            sbd.submit_no as submitNo,
-            sbd.bank_handleno
+            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_number as bankNumber,
-        sbd.bank_name ,
+        sbd.bank_name as bankName,
-        sbd.bank_brank ,
+        sbd.bank_brank as bankBrank,
-        sbd.payable_amount ,
+        sbd.payable_amount as payableAmount ,
-        sbd.payin_amount ,
+        sbd.payin_amount as payinAmount,
-        sbd.pay_date ,
+        sbd.pay_date as payDate ,
-        sbd.pay_month ,
+        sbd.pay_month as payMonth ,
-        sbd.is_reissue ,
+        sbd.is_reissue as isReissue ,
-        sbd.work_days ,
+        sbd.work_days as workDays ,
-        sbd.finance_sure ,
+        sbd.finance_sure as financeSure ,
-        sbd.person_sure ,
+        sbd.person_sure as personSure,
-        sbd.submit_no ,
+        sbd.submit_no as submitNo ,
-        sbd.bank_handleno
+        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_number as bankNumber ,
-            sbd.bank_name ,
+            sbd.bank_name as bankName ,
-            sbd.bank_brank ,
+            sbd.bank_brank as bankBrank ,
-            sbd.payable_amount ,
+            sbd.payable_amount as payableAmount ,
-            sbd.payin_amount ,
+            sbd.payin_amount as payinAmount,
-            sbd.pay_date ,
+            sbd.pay_date as payDate ,
-            sbd.pay_month ,
+            sbd.pay_month as payMonth ,
-            sbd.is_reissue ,
+            sbd.is_reissue as isReissue ,
-            sbd.work_days ,
+            sbd.work_days as workDays,
-            sbd.finance_sure ,
+            sbd.finance_sure as financeSure,
-            sbd.person_sure ,
+            sbd.person_sure as personSure,
-            sbd.submit_no ,
+            sbd.submit_no as submitNo,
-            sbd.bank_handleno ,
+            sbd.bank_handleno as bankHandleno,
-            bsb.start_time ,
+            bsb.start_time as startTime,
-			bsb.end_time ,
+			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

real-name/src/main/resources/mappers/person/PersonTrainMapper.xml

@@ -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>
 

real-name/src/main/resources/mappers/person/RedlistMapper.xml

@@ -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>
 
     <!--获取满足点赞条件的人员身份证号-->

real-name/src/main/resources/mappers/salaryfile/SalaryCheckMapper.xml

@@ -1105,15 +1105,15 @@
     </insert>
 
     <sql id="getHistoryRef">
-        SELECT jrh.reword_num,
+        SELECT jrh.reword_num as rewordNum,
-               jrh.submitter_id,
+               jrh.submitter_id as submitterId,
                su.username as submitterName,
                su.PHONE    as userPhone,
                sr.name     as roleName,
-               jrh.submit_time,
+               jrh.submit_time as submitTime,
-               jrh.flow_node,
+               jrh.flow_node as flowNode,
-               jrh.audit_result,
+               jrh.audit_result as auditResult,
-               jrh.audit_remark
+               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