版本查询接口二版

src/com/engine/organization/mapper/version/CompanyVersionMapper.java

@@ -81,6 +81,6 @@ public interface CompanyVersionMapper {
     /**
      * 获取人员版本记录
      */
-    List<HrmResourceVersion> getResourceVersionList(@Param("departmentid") String departmentid,@Param("version") String version);
+    List<HrmResourceVersion> getResourceVersionList(@Param("resourceid") String resourceid,@Param("version") String version);
 
 }

src/com/engine/organization/mapper/version/CompanyVersionMapper.xml

@@ -299,7 +299,7 @@
                jobtitle,jobactivitydesc,joblevel,seclevel,departmentid,subcompanyid1,costcenterid,managerid,assistantid,
                bankid1,accountid1,resourceimageid,certificatenum,nativeplace,educationlevel,bememberdate,bepartydate,
                workcode,regresidentplace,healthinfo,residentplace,policy,degree,height,classification,description,
-               operator,version,operate_time as operateTime as operateTime from HRMRESOURCE_VERSION
+               operator,version,operate_time as operateTime from HRMRESOURCE_VERSION
         <where>
             <if test="resourceid !=null">
                 and resourceid = #{resourceid}

src/com/engine/organization/service/impl/VersionManageServiceImpl.java

@@ -24,6 +24,7 @@ import weaver.hrm.User;
 
 import java.sql.Date;
 import java.sql.Timestamp;
+import java.text.SimpleDateFormat;
 import java.util.*;
 
 /**
@@ -74,7 +75,7 @@ public class VersionManageServiceImpl extends Service implements VersionManageSe
         String operateName = user.getUsername();
         String id = (String) params.get("id");
         String version = (String) params.get("version");
-        String operateTime = null;
+        String operateTime = "";
         Map<String, Object> resultMap = new HashMap<>();
         List versions = new ArrayList<>();
         List<VersionData> datas = new ArrayList<>();
@@ -83,6 +84,9 @@ public class VersionManageServiceImpl extends Service implements VersionManageSe
                 List<HrmSubCompanyVersion> list = getCompanyVersionMapper().getSubComVersionList(id, null);
 
                 int size = list.size();
+                if (size < 1) {
+                    break;
+                }
                 for (HrmSubCompanyVersion hrmSubCompanyVersion : list) {
                     Map<String, String> map = new HashMap<>();
                     map.put("value", String.format("%.1f", hrmSubCompanyVersion.getVersion()));
@@ -101,12 +105,16 @@ public class VersionManageServiceImpl extends Service implements VersionManageSe
                     datas.add(VersionData.builder().fieldId("分部编码").fieldValue(Util.null2String(hrmSubCompanyVersion.getSubCompanyCode())).build());
                     datas.add(VersionData.builder().fieldId("排序").fieldValue(Util.null2String(hrmSubCompanyVersion.getShowOrder())).build());
                     operateName = hrmSubCompanyVersion.getOperator();
-                    operateTime = OrganizationDateUtil.getFormatLocalDate(hrmSubCompanyVersion.getOperateTime());
+                    SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+                    operateTime = sdf.format(hrmSubCompanyVersion.getOperateTime());
                 }
                 break;
             case 2:
                 List<HrmDepartmentVersion> deptVersionList = getCompanyVersionMapper().getDeptVersionList(id, null);
                 int deptSize = deptVersionList.size();
+                if (deptSize < 1) {
+                    break;
+                }
                 for (HrmDepartmentVersion hrmDepartmentVersion : deptVersionList) {
                     Map<String, String> map = new HashMap<>();
                     map.put("value", String.format("%.1f", hrmDepartmentVersion.getVersion()));
@@ -127,11 +135,17 @@ public class VersionManageServiceImpl extends Service implements VersionManageSe
                     datas.add(VersionData.builder().fieldId("部门负责人").fieldValue(Util.null2String(hrmDepartmentVersion.getBmfzr())).build());
                     datas.add(VersionData.builder().fieldId("版本号").fieldValue(Util.null2String(String.format("%.1f", hrmDepartmentVersion.getVersion()))).build());
                     datas.add(VersionData.builder().fieldId("排序").fieldValue(Util.null2String(hrmDepartmentVersion.getShowOrder())).build());
+                    operateName = hrmDepartmentVersion.getOperator();
+                    SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+                    operateTime = sdf.format(hrmDepartmentVersion.getOperateTime());
                 }
                 break;
             case 4:
                 List<HrmResourceVersion> resVersionList = getCompanyVersionMapper().getResourceVersionList(id, null);
                 int resSize = resVersionList.size();
+                if (resSize < 1) {
+                    break;
+                }
                 for (HrmResourceVersion hrmResourceVersion : resVersionList) {
                     Map<String, String> map = new HashMap<>();
                     map.put("value", String.format("%.1f", hrmResourceVersion.getVersion()));
@@ -148,6 +162,9 @@ public class VersionManageServiceImpl extends Service implements VersionManageSe
                     datas.add(VersionData.builder().fieldId("岗位").fieldValue(Util.null2String(hrmResourceVersion.getJobtitle())).build());
                     datas.add(VersionData.builder().fieldId("分部").fieldValue(Util.null2String(hrmResourceVersion.getSubcompanyid1())).build());
                     datas.add(VersionData.builder().fieldId("版本号").fieldValue(Util.null2String(String.format("%.1f", hrmResourceVersion.getVersion()))).build());
+                    operateName = hrmResourceVersion.getOperator();
+                    SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+                    operateTime = sdf.format(hrmResourceVersion.getOperateTime());
                 }
                 break;
             default: