Pre Merge pull request !143 from dxfeng/feature/dxf

src/com/engine/organization/entity/job/dto/JobListDTO.java

@@ -31,16 +31,16 @@ public class JobListDTO {
      * 是否被引用
      */
     private Integer isUsed;
+    /**
+     * 名称
+     */
+    @TableTitle(title = "名称", dataIndex = "jobName", key = "jobName",width = "150")
+    private String jobName;
     /**
      * 编号
      */
     @TableTitle(title = "编号", dataIndex = "jobNo", key = "jobNo")
     private String jobNo;
-    /**
-     * 名称
-     */
-    @TableTitle(title = "名称", dataIndex = "jobName", key = "jobName")
-    private String jobName;
     /**
      * 所属分部
      */

src/com/engine/organization/entity/logview/vo/LogViewVO.java

@@ -38,6 +38,9 @@ public class LogViewVO {
     @OrganizationTableColumn(text = "所属模块", width = "16%", column = "operate_module_name")
     private String operateModuleName;
 
+    @OrganizationTableColumn(text = "修改详情", width = "16%")
+    private String showDetail;
+
     @OrganizationTableColumn(text = "操作IP", width = "16%", column = "client_ip")
     private String clientIp;
 

src/com/engine/organization/service/ExtService.java

@@ -38,7 +38,7 @@ public interface ExtService {
      * @param groupId
      * @return
      */
-    List<SearchConditionItem> getExtSaveForm(User user, String extendType, String tableName, int viewAttr, String groupId, String autoNoField, String serialType);
+    List<SearchConditionItem> getExtSaveForm(User user, String extendType, String tableName, int viewAttr, String groupId, String autoNoField, String serialType, String... readOnlyFields);
 
     /**
      * 组装明细表表单

src/com/engine/organization/service/LogViewService.java

@@ -19,4 +19,6 @@ public interface LogViewService {
     Map<String, Object> listPage(LogViewSearchParam param);
 
     Map<String, Object> getSearchCondition();
+
+    String showDetailById(Long id);
 }

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

@@ -74,7 +74,7 @@ public class ExtServiceImpl extends Service implements ExtService {
             SearchConditionItem item = ExtendInfoBO.getSearchConditionItem(user, viewAttr, extendInfoPO, null == compExtMap ? null : compExtMap.get(extendInfoPO.getFieldName()));
             item.setFieldcol(16);
             if (2 == viewAttr) {
-                if (readOnlyFieldList.contains(extendInfoPO.getFieldName())) {
+                if (CollectionUtils.isNotEmpty(readOnlyFieldList) && readOnlyFieldList.contains(extendInfoPO.getFieldName())) {
                     item.setViewAttr(1);
                 } else if (1 == extendInfoPO.getIsrequired()) {
                     item.setViewAttr(3);
@@ -91,17 +91,20 @@ public class ExtServiceImpl extends Service implements ExtService {
     }
 
     @Override
-    public List<SearchConditionItem> getExtSaveForm(User user, String extendType, String tableName, int viewAttr, String groupId, String autoNoField, String serialType) {
+    public List<SearchConditionItem> getExtSaveForm(User user, String extendType, String tableName, int viewAttr, String groupId, String autoNoField, String serialType, String... readOnlyFields) {
         List<SearchConditionItem> conditionItems = new ArrayList<>();
 
         // 2编辑 1查看
         OrganizationAssert.notNull(groupId, "请选择对应的拓展页");
         List<ExtendInfoPO> infoPOList = getExtendInfoMapper().listFields(extendType, groupId, tableName, ExtendInfoOperateType.ADD.getValue());
         // 组装拓展页内容
+        List<String> readOnlyFieldList = Arrays.asList(readOnlyFields);
         for (ExtendInfoPO extendInfoPO : infoPOList) {
             SearchConditionItem item = ExtendInfoBO.getSearchConditionItem(user, viewAttr, extendInfoPO, null);
             item.setFieldcol(16);
-            if (1 == extendInfoPO.getIsrequired()) {
+            if (CollectionUtils.isNotEmpty(readOnlyFieldList) && readOnlyFieldList.contains(extendInfoPO.getFieldName())) {
+                item.setViewAttr(1);
+            } else if (1 == extendInfoPO.getIsrequired()) {
                 item.setViewAttr(3);
                 item.setRules("required");
             }

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

@@ -245,7 +245,7 @@ public class JobServiceImpl extends Service implements JobService {
         List<ExtendTitlePO> extendTitles = getExtendTitleMapper().getTitlesByGroupID(GROUP_ID);
         if (CollectionUtils.isNotEmpty(extendTitles)) {
             for (ExtendTitlePO extendTitle : extendTitles) {
-                List<SearchConditionItem> items = getExtService(user).getExtSaveForm(user, EXTEND_TYPE + "", JCL_ORG_JOB, 2, extendTitle.getId().toString(), "job_no", RuleCodeType.JOBTITLES.getValue());
+                List<SearchConditionItem> items = getExtService(user).getExtSaveForm(user, EXTEND_TYPE + "", JCL_ORG_JOB, 2, extendTitle.getId().toString(), "job_no", RuleCodeType.JOBTITLES.getValue(), "scheme_id");
                 if (CollectionUtils.isNotEmpty(items)) {
                     addGroups.add(new SearchConditionGroup(extendTitle.getTitle(), true, items));
                 }
@@ -275,7 +275,7 @@ public class JobServiceImpl extends Service implements JobService {
         List<ExtendTitlePO> extendTitles = getExtendTitleMapper().getTitlesByGroupID(GROUP_ID);
         if (CollectionUtils.isNotEmpty(extendTitles)) {
             for (ExtendTitlePO extendTitle : extendTitles) {
-                List<SearchConditionItem> items = getExtService(user).getExtForm(user, EXTEND_TYPE + "", GROUP_ID.equals(Long.parseLong(groupId)) ? JCL_ORG_JOB : JCL_ORG_JOBEXT, viewAttr, id, extendTitle.getId().toString(), "");
+                List<SearchConditionItem> items = getExtService(user).getExtForm(user, EXTEND_TYPE + "", GROUP_ID.equals(Long.parseLong(groupId)) ? JCL_ORG_JOB : JCL_ORG_JOBEXT, viewAttr, id, extendTitle.getId().toString(), "scheme_id");
                 if (CollectionUtils.isNotEmpty(items)) {
                     addGroups.add(new SearchConditionGroup(extendTitle.getTitle(), true, items));
                 }

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

@@ -76,6 +76,11 @@ public class LogViewServiceImpl extends Service implements LogViewService {
         return apiDatas;
     }
 
+    @Override
+    public String showDetailById(Long id) {
+        return null;
+    }
+
     private String buildSqlWhere(LogViewSearchParam param) {
         if (null == param) {
             return "";