Przeglądaj źródła

小程序公出修改

anderx 3 lat temu
rodzic
commit
c3f9e3ad7a

+ 2 - 2
.idea/artifacts/kede_server_war_exploded.xml

@@ -1,6 +1,6 @@
 <component name="ArtifactManager">
   <artifact type="exploded-war" build-on-make="true" name="kede-server:war exploded">
-    <output-path>$PROJECT_DIR$/out</output-path>
+    <output-path>$PROJECT_DIR$/target/kede-server-1.0.0-BUILD-SNAPSHOT</output-path>
     <properties id="maven-jee-properties">
       <options>
         <exploded>true</exploded>
@@ -45,7 +45,7 @@
           <element id="library" level="project" name="Maven: org.apache.commons:commons-pool2:2.4.2" />
           <element id="library" level="project" name="Maven: org.mybatis:mybatis:3.2.8" />
           <element id="library" level="project" name="Maven: org.mybatis:mybatis-spring:1.2.2" />
-          <element id="library" level="project" name="Maven: com.alibaba:druid:1.0.25" />
+          <element id="library" level="project" name="Maven: com.alibaba:druid:1.1.20" />
           <element id="library" level="project" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.8.2" />
           <element id="library" level="project" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.8.0" />
           <element id="library" level="project" name="Maven: com.fasterxml.jackson.core:jackson-core:2.8.2" />

+ 0 - 13
.idea/libraries/Maven__com_alibaba_druid_1_0_25.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: com.alibaba:druid:1.0.25">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/druid/1.0.25/druid-1.0.25.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/druid/1.0.25/druid-1.0.25-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/alibaba/druid/1.0.25/druid-1.0.25-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

+ 4 - 2
kede-server.iml

@@ -20,7 +20,9 @@
       <configuration />
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
@@ -60,7 +62,7 @@
     <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.4.2" level="project" />
     <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.25" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:druid:1.1.20" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.8.2" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.8.0" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.8.2" level="project" />

+ 11 - 11
pom.xml

@@ -72,17 +72,17 @@
 			<artifactId>spring-web</artifactId>
 			<version>${org.springframework-version}</version>
 		</dependency>
-	<!-- Javax Annotation -->  
+	<!-- Javax Annotation -->
 <dependency>
      <groupId>javax.xml.bind</groupId>
      <artifactId>jaxb-api</artifactId>
      <version>2.3.0</version>
- </dependency>    
- <!-- Javax Annotation -->  
-        <dependency>  
-            <groupId>javax.annotation</groupId>  
-            <artifactId>jsr250-api</artifactId>  
-            <version>1.0</version>  
+ </dependency>
+ <!-- Javax Annotation -->
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>jsr250-api</artifactId>
+            <version>1.0</version>
         </dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -159,7 +159,7 @@
 		<dependency>
 			<groupId>com.alibaba</groupId>
 			<artifactId>druid</artifactId>
-			<version>1.0.25</version>
+			<version>1.1.20</version>
 			<exclusions>
 				<exclusion>
 					<groupId>com.alibaba</groupId>
@@ -334,13 +334,13 @@
 			<artifactId>json-simple</artifactId>
 			<version>1.1.1</version>
 		</dependency>
-		
+
 		    <dependency>
            <groupId>org.apache.poi</groupId>
            <artifactId>poi</artifactId>
            <version>3.17</version>
        </dependency>
-       
+
 		<dependency>
 			<groupId>org.apache.poi</groupId>
 			<artifactId>poi-ooxml</artifactId>
@@ -502,4 +502,4 @@
 			</snapshots>
 		</pluginRepository>
 	</pluginRepositories>
-</project>
+</project>

+ 17 - 6
src/main/java/com/goafanti/common/mapper/PublicReleaseMapper.xml

@@ -36,13 +36,14 @@
     <result column="update_status" jdbcType="INTEGER" property="updateStatus" />
     <result column="assist" jdbcType="INTEGER" property="assist" />
     <result column="assist_aid" jdbcType="VARCHAR" property="assistAid" />
+    <result column="assist_aid_name" jdbcType="VARCHAR" property="assistAidName" />
   </resultMap>
   <sql id="Base_Column_List">
     id, `uid`, aid, release_start, release_end, remarks, annex_url, user_name, longitude,
     latitude, `status`, create_time, clock_in, clock_in_time, photo_url, pid, pname,
     ufid, duration, valid_date, new_user, sign_sum, main_status, supplement, audit_info,
     `plan`, expected_effect, next_plan, `type`, order_no, update_time, update_status,
-    assist, assist_aid
+    assist, assist_aid, assist_aid_name
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select
@@ -65,8 +66,8 @@
       main_status, supplement, audit_info,
       `plan`, expected_effect, next_plan,
       `type`, order_no, update_time,
-      update_status, assist, assist_aid
-      )
+      update_status, assist, assist_aid,
+      assist_aid_name)
     values (#{id,jdbcType=INTEGER}, #{uid,jdbcType=VARCHAR}, #{aid,jdbcType=VARCHAR},
       #{releaseStart,jdbcType=TIMESTAMP}, #{releaseEnd,jdbcType=TIMESTAMP}, #{remarks,jdbcType=VARCHAR},
       #{annexUrl,jdbcType=VARCHAR}, #{userName,jdbcType=VARCHAR}, #{longitude,jdbcType=VARCHAR},
@@ -77,8 +78,8 @@
       #{mainStatus,jdbcType=INTEGER}, #{supplement,jdbcType=VARCHAR}, #{auditInfo,jdbcType=VARCHAR},
       #{plan,jdbcType=VARCHAR}, #{expectedEffect,jdbcType=VARCHAR}, #{nextPlan,jdbcType=VARCHAR},
       #{type,jdbcType=INTEGER}, #{orderNo,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},
-      #{updateStatus,jdbcType=INTEGER}, #{assist,jdbcType=INTEGER}, #{assistAid,jdbcType=VARCHAR}
-      )
+      #{updateStatus,jdbcType=INTEGER}, #{assist,jdbcType=INTEGER}, #{assistAid,jdbcType=VARCHAR},
+      #{assistAidName,jdbcType=VARCHAR})
   </insert>
 
   <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.PublicRelease" useGeneratedKeys="true">
@@ -186,6 +187,9 @@
       <if test="assistAid != null">
         assist_aid,
       </if>
+      <if test="assistAidName != null">
+        assist_aid_name,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -290,6 +294,9 @@
       <if test="assistAid != null">
         #{assistAid,jdbcType=VARCHAR},
       </if>
+      <if test="assistAidName != null">
+        #{assistAidName,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.PublicRelease">
@@ -394,6 +401,9 @@
       <if test="assistAid != null">
         assist_aid = #{assistAid,jdbcType=VARCHAR},
       </if>
+      <if test="assistAidName != null">
+        assist_aid_name = #{assistAidName,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -431,7 +441,8 @@
       update_time = #{updateTime,jdbcType=TIMESTAMP},
       update_status = #{updateStatus,jdbcType=INTEGER},
       assist = #{assist,jdbcType=INTEGER},
-      assist_aid = #{assistAid,jdbcType=VARCHAR}
+      assist_aid = #{assistAid,jdbcType=VARCHAR},
+      assist_aid_name = #{assistAidName,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
 

+ 16 - 3
src/main/java/com/goafanti/common/model/PublicRelease.java

@@ -5,7 +5,7 @@ import java.util.Date;
 
 /**
  * public_release
- * @author 
+ * @author an
  */
 public class PublicRelease implements Serializable {
     private Integer id;
@@ -146,7 +146,7 @@ public class PublicRelease implements Serializable {
     private String nextPlan;
 
     /**
-     * 分类 0业务 1技术 2行政
+     * 分类 0业务 1技术 2行政 3 协单
      */
     private Integer type;
 
@@ -175,6 +175,11 @@ public class PublicRelease implements Serializable {
      */
     private String assistAid;
 
+    /**
+     * 协单人员
+     */
+    private String assistAidName;
+
     private static final long serialVersionUID = 1L;
 
     public Integer getId() {
@@ -448,4 +453,12 @@ public class PublicRelease implements Serializable {
     public void setAssistAid(String assistAid) {
         this.assistAid = assistAid;
     }
-}
+
+    public String getAssistAidName() {
+        return assistAidName;
+    }
+
+    public void setAssistAidName(String assistAidName) {
+        this.assistAidName = assistAidName;
+    }
+}