Bläddra i källkod

部分备注修改

yue 5 år sedan
förälder
incheckning
3c557b453b

+ 27 - 0
jeeplus.iml

@@ -14,6 +14,15 @@
     <facet type="Spring" name="Spring">
       <configuration />
     </facet>
+    <facet type="jpa" name="JPA">
+      <configuration>
+        <setting name="validation-enabled" value="true" />
+        <datasource-mapping>
+          <factory-entry name="Entities" />
+        </datasource-mapping>
+        <naming-strategy-map />
+      </configuration>
+    </facet>
   </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
     <output url="file://$MODULE_DIR$/target/classes" />
@@ -47,6 +56,24 @@
     <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.2.8" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.2.2" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:druid:1.0.11" level="project" />
+    <orderEntry type="module-library">
+      <library name="Maven: com.alibaba:jconsole:1.8.0">
+        <CLASSES>
+          <root url="jar://C:/Program Files/Java/jdk1.8.0_221/lib/jconsole.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="Maven: com.alibaba:tools:1.8.0">
+        <CLASSES>
+          <root url="jar://C:/Program Files/Java/jdk1.8.0_221/lib/tools.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
     <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.30" level="project" />
     <orderEntry type="module-library">
       <library name="Maven: ojdbc14:ojdbc14:10.2.0.3.0">

+ 1 - 1
src/main/java/com/jeeplus/modules/act/service/ActTaskService.java

@@ -1220,7 +1220,7 @@ public class ActTaskService extends BaseService {
 				Project user = MyActiviUtils.findUser(act.getProcInsId());
 				vars.put("policy", user.getDistributionPolicy());
 			}
-			vars.put("pass", true);
+
 			act.setComment("[存在问题]" + act.getComment());
 			act.preUpdate();
 			// 对不同环节的业务逻辑进行操作

+ 0 - 3
src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/utils/EndTaskListen.java

@@ -20,10 +20,7 @@ public class EndTaskListen implements Serializable, ExecutionListener {
     @Override
     public void notify(DelegateExecution delegateExecution) throws Exception {
         try {
-            System.out.println("status");
-            System.out.println("procinsId");
             String processInstanceId = delegateExecution.getProcessInstanceId();
-            System.out.println(processInstanceId);
             projectService.updateStatusBy("2", processInstanceId);
         } catch (Exception e) {
             e.printStackTrace();

+ 2 - 0
src/main/java/com/jeeplus/modules/sg/picking/activiti/entity/MdSmallClass.java

@@ -3,7 +3,9 @@ package com.jeeplus.modules.sg.picking.activiti.entity;
 import com.jeeplus.core.persistence.ActEntity;
 
 public class MdSmallClass extends ActEntity<MdSmallClass> {
+   //小类名称
    private String name;
+   //单位
    private String mdUnit;
 
    public String getMdUnit() {

+ 2 - 0
src/main/java/com/jeeplus/modules/sg/picking/activiti/entity/MdTheClass.java

@@ -5,7 +5,9 @@ import com.jeeplus.core.persistence.ActEntity;
 import java.util.List;
 
 public class MdTheClass extends ActEntity<MdTheClass> {
+    //中类名称
     private String name;
+    //包含的小类名称
     private List<MdSmallClass> mdSmallClassList;
 
     public List<MdSmallClass> getMdSmallClassList() {

+ 1 - 0
src/main/java/com/jeeplus/modules/sg/picking/activiti/entity/PickApplication.java

@@ -3,6 +3,7 @@ package com.jeeplus.modules.sg.picking.activiti.entity;
 import com.jeeplus.core.persistence.ActEntity;
 
 public class PickApplication extends ActEntity<PickApplication> {
+    //项目定义号
     private String projectId;
 
     public String getProjectId() {

+ 2 - 0
src/main/java/com/jeeplus/modules/sg/picking/activiti/entity/ProjectNumber.java

@@ -1,7 +1,9 @@
 package com.jeeplus.modules.sg.picking.activiti.entity;
 
 public class ProjectNumber {
+    //项目需求名称
     private String requireName;
+    //选择版本号
     private String theNumber;
 
     public String getRequireName() {