项目里程碑

zjugis-business/src/main/resources/templates/FlowProject/js/apply.js

@@ -2,7 +2,7 @@
   var lists = [];
   var projectId = $("[name='project$id']").val()
   let viewState = z.ui.comm.getUrlParam("_o");
-  let read = z.ui.comm.getUrlParam("read");
+  let isFirst = z.ui.comm.getUrlParam("isFirst");
   let flowInstanceId = "";
   let isView = "";
   window.onload = function () {
@@ -303,52 +303,56 @@
           + '</div>'
           + '</div>'
           + '</td>'
-          + '<td>'
-          + '<div id="editBtn_' + (i) + '" class="table-btn editBtn_' + (i) + '" data-index="' + (i) + '">'
-          + '<span>编辑</span>'
-          + '</div>'
-          + '<div id="delBtn_' + (i) + '" class="table-btn delBtn_' + (i) + '" data-index="' + (i) + '">'
-          + '<span>删除</span>'
-          + '</div>'
-          + '</td></tr>';
+          + '<td>';
+          if(isFirst !== '0' && viewState !== 'v') {
+            html += '<div id="editBtn_' + (i) + '" class="table-btn editBtn_' + (i) + '" data-index="' + (i) + '">'
+            + '<span>编辑</span>'
+            + '</div>'
+            + '<div id="delBtn_' + (i) + '" class="table-btn delBtn_' + (i) + '" data-index="' + (i) + '">'
+            + '<span>删除</span>'
+            + '</div>'
+          }
+          html += '</td></tr>';
     }
     tbodyQjsq.innerHTML = html
     for (let i = 0; i < lists.length; i++) {
       z.ui.date("[name='ProjectMilestone[" + i + "]$planFinishTime']").init()
-      $("#delBtn_" + i).click(function () {
-        z.ui.confirm("compid").init({
-          content: "确定删除吗？",
-          onConfirm: function () {
-            var element = document.getElementById("project_milestone_" + i);
-            element.remove();
-            buildSeq();
-            lists.splice(i, 1)
-            updateView();
-          },
-          onCancel: function () {
+      if(isFirst !== '0' && viewState !== 'v') {
+        $("#delBtn_" + i).click(function () {
+          z.ui.confirm("compid").init({
+            content: "确定删除吗？",
+            onConfirm: function () {
+              var element = document.getElementById("project_milestone_" + i);
+              element.remove();
+              buildSeq();
+              lists.splice(i, 1)
+              updateView();
+            },
+            onCancel: function () {
+
+            }
+          })
 
+        })
+        $("#editBtn_" + i).click(function () {
+          const span = $(this).find("span");
+          const html = span.html();
+          if (html === '编辑') {
+            span.html('保存')
+            detailWrite(i);
+            $("#addData").attr('disabled', "true");
+            $("#project_milestone_" + i).removeClass("form-table-disable")
+            return;
+          }
+          if (html === '保存') {
+            span.html('编辑')
+            detailReadonly(i, false, "project_milestone_")
+            $("#addData").removeAttr('disabled')
+            $("#project_milestone_" + i).addClass("form-table-disable")
+            return;
           }
         })
-
-      })
-      $("#editBtn_" + i).click(function () {
-        const span = $(this).find("span");
-        const html = span.html();
-        if (html === '编辑') {
-          span.html('保存')
-          detailWrite(i);
-          $("#addData").attr('disabled', "true");
-          $("#project_milestone_" + i).removeClass("form-table-disable")
-          return;
-        }
-        if (html === '保存') {
-          span.html('编辑')
-          detailReadonly(i, false,"project_milestone_")
-          $("#addData").removeAttr('disabled')
-          $("#project_milestone_" + i).addClass("form-table-disable")
-          return;
-        }
-      })
+      }
       detailReadonly(i,false,"project_milestone_")
       $("#project_milestone_" + i).addClass("form-table-disable")
       // if(viewState === 'v' || read=== '1'){

zjugis-business/src/main/resources/templates/public/workFlow.ftl

@@ -77,16 +77,16 @@
                     yjnrElement.value = "同意";
                 }
             }
+        }
 
-            function getUrlParam(param) {
-                var regex = new RegExp('[?&]' + param + '(=([^&#]*)|&|#|$)');
-                var url = window.location.href;
-                var results = regex.exec(url);
+        function getUrlParam(param) {
+            var regex = new RegExp('[?&]' + param + '(=([^&#]*)|&|#|$)');
+            var url = window.location.href;
+            var results = regex.exec(url);
 
-                if (!results) return null;
-                if (!results[2]) return '';
-                return decodeURIComponent(results[2].replace(/\+/g, ' '));
-            }
+            if (!results) return null;
+            if (!results[2]) return '';
+            return decodeURIComponent(results[2].replace(/\+/g, ' '));
         }
     </script>
     </@h.html>

zjugis-workflow/src/main/java/com/zjugis/z_workflow/controller/TModalController.java

@@ -13,6 +13,7 @@ import com.zjugis.z_workflow.entity.TFlowTemplate;
 import com.zjugis.z_workflow.entityExtend.ActivityInstanceDTO;
 import com.zjugis.z_workflow.service.*;
 import com.zjugis.z_workflow.utils.*;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
@@ -43,6 +44,7 @@ import static com.zjugis.z_workflow.exception.enums.TransferExceptionEnum.GET_OP
  * @Version: v1.0
  */
 @RestController
+@Slf4j
 public class TModalController extends BaseController {
 
 	@Value("${serviceUrl.z_workflow}")
@@ -275,7 +277,7 @@ public class TModalController extends BaseController {
 					if (!CollectionUtils.isEmpty(util.resList) && StringUtils.isBlank(util.activityInstanceId)) {
 						util.activityInstanceId = util.resList.get(util.resList.size() - 1).getActivityInstanceId();
 					}
-					if (util.resList.size() > 0) {
+					if (!util.resList.isEmpty()) {
 						Optional<ActivityInstanceDTO> optional = util.resList.stream().filter(t -> t.getActivityInstanceId().equals(util.activityInstanceId)).findFirst();
 						if (optional.isPresent()) {
 							util.activityTemplateId = optional.get().getActivityTemplateId();
@@ -364,9 +366,12 @@ public class TModalController extends BaseController {
 				inMap.put("flowDesc", flowInstance.getDescribtion());
 				if (!StringUtils.isBlank(this.activityInstanceId)) {
 					List<ISendBackRecord> records = iSendBackRecordService.getBackToActivityList(Arrays.asList(this.activityInstanceId));
-					if (records.size() > 0) {
+					if (!records.isEmpty()) {
 						ISendBackRecord sendBackRecord = records.get(0);
-						inMap.put("backUser", callInterfaceService.getUserByUserId(sendBackRecord.getBackWorkerId()).getNickname());
+						if(StringUtils.isNotBlank(sendBackRecord.getBackWorkerId())){
+							log.error("退回用户id缺失");
+							inMap.put("backUser", callInterfaceService.getUserByUserId(sendBackRecord.getBackWorkerId()).getNickname());
+						}
 						inMap.put("backTime", sendBackRecord.getCreateTime());
 						inMap.put("backReason", sendBackRecord.getBackReason());
 					}
@@ -374,8 +379,8 @@ public class TModalController extends BaseController {
 				inMap.put("btnHTML", getBtnListByRight(flowInstance.getFlowTemplateVersionId(),
 						tFlowTemplate.getFlowTemplateType(), this.activityTemplateId, this.activityInstanceId,
 						this.userId, this.isPrint, isView, isFirst, isFocus, isSubProcess));
-			}
-			inMap.put("child", child);
+			}			inMap.put("child", child);
+
 			inMap.put("materialViewMethod", this.materialViewMethod);
 			inMap.put("iSignImgAdaptation", this.iSignImgAdaptation);
 			inMap.put("iTopCurrentOpinion", this.iTopCurrentOpinion);

zjugis-workflow/src/main/java/com/zjugis/z_workflow/utils/BtnUtil.java

@@ -339,7 +339,7 @@ public class BtnUtil {
 			this.isSameLevelBtn = isame;
 			if (CollectionUtils.isEmpty(typeList)) {
 				List<TFunctionBtnRel> tFunctionBtnRels = tFunctionBtnRelService.findBtnRel(flowTemplateVersionId, activityTemplateId);
-				this.typeList = tFunctionBtnRels.stream().filter(t -> StringUtils.isBlank(t.getShowActivityId()) || t.getShowActivityId().contains(this.activityTemplateId)).map(TFunctionBtnRel::getBtnType).collect(Collectors.toSet());
+				this.typeList = tFunctionBtnRels.stream().filter(t -> StringUtils.isBlank(t.getShowActivityId()) || (StringUtils.isNotBlank(this.activityTemplateId) && t.getShowActivityId().contains(this.activityTemplateId))).map(TFunctionBtnRel::getBtnType).collect(Collectors.toSet());
 			}
 		}