Explorar el Código

Merge branch 'test' of jishutao/kede-server into prod

anderx hace 4 años
padre
commit
c1435c7865

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

@@ -24,14 +24,14 @@
     <result column="valid_date" jdbcType="VARCHAR" property="validDate" />
     <result column="new_user" jdbcType="INTEGER" property="newUser" />
     <result column="sign_sum" jdbcType="INTEGER" property="signSum" />
-    <result column="mian_status" jdbcType="INTEGER" property="mainStatus" />
+    <result column="main_status" jdbcType="INTEGER" property="mainStatus" />
     <result column="supplement" jdbcType="VARCHAR" property="supplement" />
     <result column="audit_info" jdbcType="VARCHAR" property="auditInfo" />
   </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, mian_status, supplement, audit_info
+    ufid, duration, valid_date, new_user, sign_sum, main_status, supplement, audit_info
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
@@ -51,7 +51,7 @@
       clock_in_time, photo_url, pid, 
       pname, ufid, duration, 
       valid_date, new_user, sign_sum, 
-      mian_status, supplement, audit_info
+      main_status, supplement, audit_info
       )
     values (#{uid,jdbcType=VARCHAR}, #{aid,jdbcType=VARCHAR}, #{releaseStart,jdbcType=TIMESTAMP}, 
       #{releaseEnd,jdbcType=TIMESTAMP}, #{remarks,jdbcType=VARCHAR}, #{annexUrl,jdbcType=VARCHAR}, 
@@ -130,7 +130,7 @@
         sign_sum,
       </if>
       <if test="mainStatus != null">
-        mian_status,
+        main_status,
       </if>
       <if test="supplement != null">
         supplement,
@@ -281,7 +281,7 @@
         sign_sum = #{signSum,jdbcType=INTEGER},
       </if>
       <if test="mainStatus != null">
-        mian_status = #{mainStatus,jdbcType=INTEGER},
+        main_status = #{mainStatus,jdbcType=INTEGER},
       </if>
       <if test="supplement != null">
         supplement = #{supplement,jdbcType=VARCHAR},
@@ -315,7 +315,7 @@
       valid_date = #{validDate,jdbcType=VARCHAR},
       new_user = #{newUser,jdbcType=INTEGER},
       sign_sum = #{signSum,jdbcType=INTEGER},
-      mian_status = #{mainStatus,jdbcType=INTEGER},
+      main_status = #{mainStatus,jdbcType=INTEGER},
       supplement = #{supplement,jdbcType=VARCHAR},
       audit_info = #{auditInfo,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
@@ -394,7 +394,7 @@
          sign_sum,
        </if>
        <if test="mainStatus != null">
-         mian_status,
+         main_status,
        </if>
        <if test="supplement != null">
          supplement,

+ 0 - 3
src/main/java/com/goafanti/order/controller/OrderProjectApiController.java

@@ -367,7 +367,6 @@ public class OrderProjectApiController extends CertifyApiController {
 	}
 	/**
 	 * 	客户项目列表
-	 * @param tid
 	 * @return
 	 */
 	@RequestMapping(value = "/selectUidByproject",method = RequestMethod.GET)
@@ -415,7 +414,6 @@ public class OrderProjectApiController extends CertifyApiController {
 	
 	/**
 	 * 	获取专利分类
-	 * @param tid
 	 * @return
 	 */
 	@RequestMapping(value = "/getPatentType",method = RequestMethod.GET)
@@ -427,7 +425,6 @@ public class OrderProjectApiController extends CertifyApiController {
 	
 	/**
 	 * 	核对列表
-	 * @param tid
 	 * @return
 	 */
 	@RequestMapping(value = "/selectProjectCheck",method = RequestMethod.GET)

+ 7 - 7
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -464,13 +464,13 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		t.setCertificateNumber(b.getCertificateNumber());
 		t.setSetUpAmount(b.getSetUpAmount());
 		TOrderTask task2=tOrderTaskMapper.selectByPrimaryKey(b.getTid());//查询出项目信息
-		if(b.getProjectStatus()!=task2.getProjectStatus()&&
-				b.getProjectStatus()==NewProjectStatus.YLX.getCode()) t.setSetUpStatus(1);
-		if(b.getProjectStatus()!=task2.getProjectStatus()&&
-				b.getProjectStatus()==NewProjectStatus.YNGS.getCode()) t.setSetUpStatus(1);
-		tOrderTaskMapper.updateByPrimaryKeySelective(t);
-		projectSplitPush(b.getTid(), b.getProjectStatus(),task2);
-		if(b.getProjectStatus()!=task2.getProjectStatus())pushTaskLog(b.getTid(), b.getProjectStatus());
+		if(b.getProjectStatus()!=task2.getProjectStatus()){
+			if(b.getProjectStatus()==NewProjectStatus.YLX.getCode()) t.setSetUpStatus(1);
+			if(b.getProjectStatus()==NewProjectStatus.YNGS.getCode()) t.setSetUpStatus(1);
+			tOrderTaskMapper.updateByPrimaryKeySelective(t);
+			projectSplitPush(b.getTid(), b.getProjectStatus(),task2);
+			pushTaskLog(b.getTid(), b.getProjectStatus());
+		}
 		return 1;
 	}