Merge remote-tracking branch 'origin/master'

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxItpTemplateServiceImpl.java

@@ -71,6 +71,10 @@ public class ZhcxItpTemplateServiceImpl extends ServiceImpl<ZhcxItpTemplateDao,
                         if(StringUtils.isNotBlank(copyNodesDo.getPath())){
                             pids.addAll(Arrays.asList(copyNodesDo.getPath().split(",")));
                         }
+                        // 获取小构件关联的大构件 jnp add
+                        if(StringUtils.isNotBlank(copyNodesDo.getPnodeid())){
+                            pids.add(copyNodesDo.getPnodeid());
+                        }
                         // 获取所有子节点
                         for (ZhcxItpTemplateNodesDo tempNodesDo : tempNodesDos) {
                             if(StringUtils.isNotBlank(tempNodesDo.getPath())){

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxOutsideInspectionItpServiceImpl.java

@@ -208,8 +208,8 @@ public class ZhcxOutsideInspectionItpServiceImpl extends ServiceImpl<ZhcxOutside
             }
             /* 取消 */
             if ("10".equals(operType)) {
-                //监理检验员只能操作自己的数据
-                if(!user.getId().equals(dispatchDo.getSupervisionuserid())){
+                //监理检验员在执行任务页面只能操作自己的数据 PageType--页面入口 task -- 执行任务页面
+                if("task".equals(vo.get(i).getPageType()) && !user.getId().equals(dispatchDo.getSupervisionuserid())){
                     sb.append("单据号:"+inspectioncode+"已被改派,不能取消,请刷新数据查看<br>");
                     continue;
                 }
@@ -228,7 +228,7 @@ public class ZhcxOutsideInspectionItpServiceImpl extends ServiceImpl<ZhcxOutside
                 dispatchDo.setDispatchstatus("30");
                 inspectionItpDo.setInspectionstatus("40");
             } else if ("20".equals(operType)) {
-                if(!user.getId().equals(dispatchDo.getSupervisionuserid())){
+                if("task".equals(vo.get(i).getPageType()) && !user.getId().equals(dispatchDo.getSupervisionuserid())){
                     sb.append("单据号:"+inspectioncode+"已被改派,不能拒收,请刷新数据查看<br>");
                     continue;
                 }
@@ -260,7 +260,7 @@ public class ZhcxOutsideInspectionItpServiceImpl extends ServiceImpl<ZhcxOutside
             } else {
                 /* 接收/有条件接收 */
                 //不是本人的数据无法接收 Inspectionstatus=40代表取消
-                if(!user.getId().equals(dispatchDo.getSupervisionuserid())){
+                if("task".equals(vo.get(i).getPageType()) && !user.getId().equals(dispatchDo.getSupervisionuserid())){
                     sb.append("单据号:"+inspectioncode+"已被改派,不能接收,请刷新数据查看<br>");
                     continue;
                 }

business-entity/src/main/java/com/rongwei/bsentity/domain/ZhcxItpTemplateNodesDo.java

@@ -198,4 +198,16 @@ public class ZhcxItpTemplateNodesDo extends BaseDo {
     @TableField("CHECKROLEID")
     private String checkroleid;
 
+    /**
+     * 组织机构ID
+     */
+    @TableField("ORGID")
+    private String orgid;
+
+    /**
+     * 组织机构名称
+     */
+    @TableField("ORGNAME")
+    private String orgname;
+
 }

business-entity/src/main/java/com/rongwei/bsentity/vo/OperOutsideInspectionVo.java

@@ -65,5 +65,8 @@ public class OperOutsideInspectionVo {
      * 签名
      */
     private String signature;
-
+    /**
+     * 页面类型
+     */
+    private String pageType;
 }