Преглед изворни кода

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

anderx пре 3 година
родитељ
комит
f5d7786aaa
20 измењених фајлова са 98 додато и 260 уклоњено
  1. 6 7
      src/main/java/com/goafanti/common/dao/NewsMapper.java
  2. 33 28
      src/main/java/com/goafanti/common/mapper/PublicReleaseMapper.xml
  3. 15 2
      src/main/java/com/goafanti/common/model/PublicRelease.java
  4. 4 5
      src/main/java/com/goafanti/common/model/TChangeTask.java
  5. 3 4
      src/main/java/com/goafanti/common/model/TOrderNew.java
  6. 0 43
      src/main/java/com/goafanti/core/auth/HttpComponentsClientHttpRequestFactoryDigestAuth.java
  7. 0 41
      src/main/java/com/goafanti/core/auth/RestClient.java
  8. 0 29
      src/main/java/com/goafanti/core/auth/RestTempleteConfig.java
  9. 0 1
      src/main/java/com/goafanti/core/cache/serializer/FastJsonRedisSerializer.java
  10. 9 12
      src/main/java/com/goafanti/core/mybatis/BaseMybatisDao.java
  11. 2 3
      src/main/java/com/goafanti/core/mybatis/JDBCIdGenerator.java
  12. 3 3
      src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java
  13. 8 5
      src/main/java/com/goafanti/order/bo/InputTChangeTask.java
  14. 3 1
      src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java
  15. 0 72
      src/main/java/com/goafanti/order/service/impl/ProjectStatisticsServiceImpl.java
  16. 9 0
      src/main/java/com/goafanti/weChat/bo/OutPublicReleaseList.java
  17. 0 2
      src/main/java/com/goafanti/weChat/controller/AdminReleaseApiController.java
  18. 1 0
      src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java
  19. 1 1
      src/main/resources/props/config_local.properties
  20. 1 1
      src/main/resources/props/config_test.properties

+ 6 - 7
src/main/java/com/goafanti/common/dao/NewsMapper.java

@@ -27,19 +27,18 @@ public interface NewsMapper {
 
 	int batchDeleteByPrimaryKey(List<String> id);
 
-	List<NewsPortalList> findNewsList(Map<String, Object> params);
 
 	List<NewsSummary> findIndexNewsList(Map<String, Object> params);
-	
+
 	List<NewsSummary> findJmrhNewsList(Map<String, Object> params);
-	
+
 	List<NewsPortalList> portalNewsPolicy();
-	
+
 	List<NewsPortalList> portalNewsQuestion();
-	
+
 	List<NewsSummary> findIndexNewsLists(Map<String, Object> params);
 
 	List<newsInterestBo> newsInterest(String uid);
 
-	
-}
+
+}

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

@@ -43,6 +43,7 @@
     <result column="reject_name" jdbcType="VARCHAR" property="rejectName" />
     <result column="assistant_aid" jdbcType="VARCHAR" property="assistantAid" />
     <result column="assistant_name" jdbcType="VARCHAR" property="assistantName" />
+    <result column="public_again" jdbcType="INTEGER" property="publicAgain" />
   </resultMap>
   <sql id="Base_Column_List">
     id, `uid`, aid, release_start, release_end, remarks, annex_url, user_name, longitude,
@@ -50,7 +51,7 @@
     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_aid_name, main_id, main_name, clock_in_remarks, reject_name,
-    assistant_aid, assistant_name
+    assistant_aid, assistant_name, public_again
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select
@@ -62,42 +63,39 @@
     delete from public_release
     where id = #{id,jdbcType=INTEGER}
   </delete>
-
   <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.PublicRelease" useGeneratedKeys="true">
-    insert into public_release (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,
+    insert into public_release (`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_aid_name, main_id, main_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},
-      #{latitude,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP},
-      #{clockIn,jdbcType=INTEGER}, #{clockInTime,jdbcType=TIMESTAMP}, #{photoUrl,jdbcType=VARCHAR},
-      #{pid,jdbcType=VARCHAR}, #{pname,jdbcType=VARCHAR}, #{ufid,jdbcType=VARCHAR}, #{duration,jdbcType=DOUBLE},
+      assist_aid_name, main_id, main_name,
+      clock_in_remarks, reject_name, assistant_aid,
+      assistant_name, public_again)
+    values (#{uid,jdbcType=VARCHAR}, #{aid,jdbcType=VARCHAR}, #{releaseStart,jdbcType=TIMESTAMP},
+      #{releaseEnd,jdbcType=TIMESTAMP}, #{remarks,jdbcType=VARCHAR}, #{annexUrl,jdbcType=VARCHAR},
+      #{userName,jdbcType=VARCHAR}, #{longitude,jdbcType=VARCHAR}, #{latitude,jdbcType=VARCHAR},
+      #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{clockIn,jdbcType=INTEGER},
+      #{clockInTime,jdbcType=TIMESTAMP}, #{photoUrl,jdbcType=VARCHAR}, #{pid,jdbcType=VARCHAR},
+      #{pname,jdbcType=VARCHAR}, #{ufid,jdbcType=VARCHAR}, #{duration,jdbcType=DOUBLE},
       #{validDate,jdbcType=VARCHAR}, #{newUser,jdbcType=INTEGER}, #{signSum,jdbcType=INTEGER},
       #{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},
-      #{assistAidName,jdbcType=VARCHAR}, #{mainId,jdbcType=INTEGER}, #{mainName,jdbcType=VARCHAR}
-      )
+      #{assistAidName,jdbcType=VARCHAR}, #{mainId,jdbcType=INTEGER}, #{mainName,jdbcType=VARCHAR},
+      #{clockInRemarks,jdbcType=VARCHAR}, #{rejectName,jdbcType=VARCHAR}, #{assistantAid,jdbcType=VARCHAR},
+      #{assistantName,jdbcType=VARCHAR}, #{publicAgain,jdbcType=INTEGER})
   </insert>
-
   <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.PublicRelease" useGeneratedKeys="true">
     insert into public_release
     <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        id,
-      </if>
       <if test="uid != null">
         `uid`,
       </if>
@@ -218,11 +216,11 @@
       <if test="assistantName != null">
         assistant_name,
       </if>
+      <if test="publicAgain != null">
+        public_again,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        #{id,jdbcType=INTEGER},
-      </if>
       <if test="uid != null">
         #{uid,jdbcType=VARCHAR},
       </if>
@@ -343,6 +341,9 @@
       <if test="assistantName != null">
         #{assistantName,jdbcType=VARCHAR},
       </if>
+      <if test="publicAgain != null">
+        #{publicAgain,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.PublicRelease">
@@ -468,6 +469,9 @@
       <if test="assistantName != null">
         assistant_name = #{assistantName,jdbcType=VARCHAR},
       </if>
+      <if test="publicAgain != null">
+        public_again = #{publicAgain,jdbcType=INTEGER},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -512,7 +516,8 @@
       clock_in_remarks = #{clockInRemarks,jdbcType=VARCHAR},
       reject_name = #{rejectName,jdbcType=VARCHAR},
       assistant_aid = #{assistantAid,jdbcType=VARCHAR},
-      assistant_name = #{assistantName,jdbcType=VARCHAR}
+      assistant_name = #{assistantName,jdbcType=VARCHAR},
+      public_again = #{publicAgain,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
 
@@ -529,7 +534,7 @@
     date_format(a.release_end ,'%Y-%m-%d %H:%i:%S') releaseEnds,date_format(a.create_time ,'%Y-%m-%d %H:%i:%S') createTimes,a.status,
     a.latitude ,a.longitude ,a.clock_in clockIn,date_format(a.update_time ,'%Y-%m-%d %H:%i:%S') updateTimes,a.update_status updateStatus,
     a.assist,a.assist_aid assistAid,a.assist_aid_name assistAidName,a.type,a.main_name mainName,a.reject_name rejectName,
-    a.assistant_aid assistantAid ,a.assistant_name assistantName
+    a.assistant_aid assistantAid ,a.assistant_name assistantName,a.public_again publicAgain
     from public_release a left join `user` b on a.uid =b.id left join admin c on a.aid =c.id
   <if test="type==2">
     left join department d on c.department_id =d.id
@@ -665,7 +670,7 @@
     a.annex_url annexUrl ,a.remarks,a.duration ,a.valid_date validDate ,a.latitude ,a.longitude ,a.aid ,c.superior_id suprId,a.uid,
     a.clock_in clockIn ,a.plan ,a.expected_effect expectedEffect,a.next_plan nextPlan,c.reviewer,a.type,a.order_no orderNo,d.contract_no contractNo,
     date_format(a.update_time ,'%Y-%m-%d %H:%i:%S') updateTimes,a.update_Status updateStatus,a.assist,a.assist_aid assistAid,a.assist_aid_name assistAidName,
-    a.main_name mainName,a.assistant_aid assistantAid,a.assistant_name assistantName
+    a.main_name mainName,a.assistant_aid assistantAid,a.assistant_name assistantName,a.public_again publicAhain
     from public_release a left join `user` b on a.uid =b.id left join admin c on a.aid =c.id
     left join t_order_new d on a.order_no=d.order_no
     where 1=1

+ 15 - 2
src/main/java/com/goafanti/common/model/PublicRelease.java

@@ -5,7 +5,7 @@ import java.util.Date;
 
 /**
  * public_release
- * @author 
+ * @author
  */
 public class PublicRelease implements Serializable {
     private Integer id;
@@ -210,6 +210,11 @@ public class PublicRelease implements Serializable {
      */
     private String assistantName;
 
+    /**
+     * 再次公出
+     */
+    private Integer publicAgain;
+
     private static final long serialVersionUID = 1L;
 
     public Integer getId() {
@@ -539,4 +544,12 @@ public class PublicRelease implements Serializable {
     public void setAssistantName(String assistantName) {
         this.assistantName = assistantName;
     }
-}
+
+    public Integer getPublicAgain() {
+        return publicAgain;
+    }
+
+    public void setPublicAgain(Integer publicAgain) {
+        this.publicAgain = publicAgain;
+    }
+}

+ 4 - 5
src/main/java/com/goafanti/common/model/TChangeTask.java

@@ -6,7 +6,7 @@ import java.util.Date;
 
 /**
  * t_change_task
- * @author 
+ * @author
  */
 public class TChangeTask implements Serializable {
     /**
@@ -60,7 +60,7 @@ public class TChangeTask implements Serializable {
     private String taskComment;
 
     /**
-     * 状态 0正常 1新增 2修改 3删除 
+     * 状态 0正常 1新增 2修改 3删除
      */
     private Integer type;
 
@@ -90,7 +90,7 @@ public class TChangeTask implements Serializable {
     private Integer officialCost;
 
     /**
-     * 费减 0否 1有 
+     * 费减 0否 1有
      */
     private Integer costReduction;
 
@@ -129,7 +129,6 @@ public class TChangeTask implements Serializable {
      */
     private Integer changeSplitSuper;
 
-    private static final long serialVersionUID = 1L;
 
     public Integer getId() {
         return id;
@@ -322,4 +321,4 @@ public class TChangeTask implements Serializable {
     public void setChangeSplitSuper(Integer changeSplitSuper) {
         this.changeSplitSuper = changeSplitSuper;
     }
-}
+}

+ 3 - 4
src/main/java/com/goafanti/common/model/TOrderNew.java

@@ -6,9 +6,9 @@ import java.util.Date;
 
 /**
  * t_order_new
- * @author 
+ * @author
  */
-public class TOrderNew implements Serializable {
+public class TOrderNew {
     /**
      * 订单编号
      */
@@ -239,7 +239,6 @@ public class TOrderNew implements Serializable {
      */
     private Integer userType;
 
-    private static final long serialVersionUID = 1L;
 
     public String getOrderNo() {
         return orderNo;
@@ -608,4 +607,4 @@ public class TOrderNew implements Serializable {
     public void setUserType(Integer userType) {
         this.userType = userType;
     }
-}
+}

+ 0 - 43
src/main/java/com/goafanti/core/auth/HttpComponentsClientHttpRequestFactoryDigestAuth.java

@@ -1,43 +0,0 @@
-package com.goafanti.core.auth;
-
-
-import java.net.URI;
-import org.apache.http.HttpHost;
-import org.apache.http.client.AuthCache;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.protocol.ClientContext;
-import org.apache.http.impl.auth.DigestScheme;
-import org.apache.http.impl.client.BasicAuthCache;
-import org.apache.http.protocol.BasicHttpContext;
-import org.apache.http.protocol.HttpContext;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
- 
-@SuppressWarnings("deprecation")
-public class HttpComponentsClientHttpRequestFactoryDigestAuth extends HttpComponentsClientHttpRequestFactory {
-	 
-	public HttpComponentsClientHttpRequestFactoryDigestAuth(HttpClient client) {
-        super(client);
-    }
- 
-    @Override
-    protected HttpContext createHttpContext(HttpMethod httpMethod, URI uri) {
-        return createHttpContext(uri);
-    }
- 
-    private HttpContext createHttpContext(URI uri) {
-        // Create AuthCache instance
-        AuthCache authCache = new BasicAuthCache();
-        // Generate DIGEST scheme object, initialize it and add it to the local auth cache
-        DigestScheme digestAuth = new DigestScheme();
-        // If we already know the realm name
-        digestAuth.overrideParamter("realm", "myrealm");
-        HttpHost targetHost = new HttpHost(uri.getHost(), uri.getPort());
-        authCache.put(targetHost, digestAuth);
- 
-        // Add AuthCache to the execution context
-        BasicHttpContext localcontext = new BasicHttpContext();
-        localcontext.setAttribute(ClientContext.AUTH_CACHE, authCache);
-        return localcontext;
-    }
-}

+ 0 - 41
src/main/java/com/goafanti/core/auth/RestClient.java

@@ -1,41 +0,0 @@
-package com.goafanti.core.auth;
-
-import java.util.Base64;
-
-
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.ResponseEntity;
-import org.springframework.util.LinkedMultiValueMap;
-import org.springframework.util.MultiValueMap;
-import org.springframework.web.client.RestTemplate;
-
-public class RestClient {
-	private final String BS_HOST= "http://localhost:8090/";
-	//@Test
-	public void whenSecuredRestApiIsConsumed_then200OK() {
-	    RestTemplate restTemplate = new RestTempleteConfig().getRestTemplate();
-	    ResponseEntity<String> entity = restTemplate.exchange(BS_HOST, HttpMethod.GET, null, String.class);
-	}
-	private HttpHeaders getHeaders(){
-		String plainCredentials="dev:123456";
-		String base64Credentials = Base64.getEncoder().encodeToString(plainCredentials.getBytes());
-		HttpHeaders headers = new HttpHeaders();
-		headers.add("Authorization", "Basic " + base64Credentials);
-		return headers;
-	}
-
-	public String sendToBs(String apiUrl,HttpMethod method,LinkedMultiValueMap<String, String> params) {
-		RestTemplate restTemplate = new RestTemplate();
-		HttpEntity<MultiValueMap<String, String>> request = new HttpEntity<MultiValueMap<String, String>>(params,getHeaders());
-		ResponseEntity<String> response = restTemplate.exchange(BS_HOST + "/" + apiUrl, method,request, String.class);
-
-		return response.getBody();
-	}
-
-//	@Test
-	public void testLogin() {
-		System.out.println(sendToBs("login", HttpMethod.GET, null));
-	}
-}

+ 0 - 29
src/main/java/com/goafanti/core/auth/RestTempleteConfig.java

@@ -1,29 +0,0 @@
-package com.goafanti.core.auth;
-
-import org.apache.http.auth.AuthScope;
-import org.apache.http.auth.UsernamePasswordCredentials;
-import org.apache.http.client.CredentialsProvider;
-import org.apache.http.impl.client.BasicCredentialsProvider;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.springframework.web.client.RestTemplate;
-
-
-public class RestTempleteConfig {
-	public RestTemplate getRestTemplate() {
-		CloseableHttpClient client = HttpClientBuilder.create().setDefaultCredentialsProvider(provider())
-				.useSystemProperties().build();
-		HttpComponentsClientHttpRequestFactory requestFactory = new HttpComponentsClientHttpRequestFactoryDigestAuth(
-				client);
- 
-		return new RestTemplate(requestFactory);
-	}
- 
-	private CredentialsProvider provider() {
-		CredentialsProvider provider = new BasicCredentialsProvider();
-		UsernamePasswordCredentials credentials = new UsernamePasswordCredentials("dev", "123456");
-		provider.setCredentials(AuthScope.ANY, credentials);
-		return provider;
-	}
-}

+ 0 - 1
src/main/java/com/goafanti/core/cache/serializer/FastJsonRedisSerializer.java

@@ -23,7 +23,6 @@ public class FastJsonRedisSerializer implements RedisSerializer<Object> {
 		pc.addAccept("com.goafanti.lecture.bo.BigShotLectureListBo");
 		pc.addAccept("com.goafanti.news.bo.NewsPortalList");
 		pc.addAccept("com.goafanti.common.model.Activity");
-
 		pc.addAccept("com.goafanti.order.bo.outStatisticsList");
 		pc.addAccept("com.goafanti.order.bo.outProvinceStatisticsList");
 		pc.addAccept("com.goafanti.weChat.bo.OutPublicStatistics");

+ 9 - 12
src/main/java/com/goafanti/core/mybatis/BaseMybatisDao.java

@@ -53,7 +53,7 @@ public class BaseMybatisDao<T> extends SqlSessionDaoSupport {
 
 	/**
 	 * 根据Sql id 去查询 分页对象
-	 * 
+	 *
 	 * @param sqlId
 	 *            对应mapper.xml 里的Sql Id
 	 * @param params
@@ -120,7 +120,7 @@ public class BaseMybatisDao<T> extends SqlSessionDaoSupport {
 
 	/**
 	 * 根据Sql ID 查询List,而不要查询分页的页码
-	 * 
+	 *
 	 * @param sqlId
 	 *            对应mapper.xml 里的Sql Id[主语句]
 	 * @param params
@@ -146,11 +146,10 @@ public class BaseMybatisDao<T> extends SqlSessionDaoSupport {
 
 	/**
 	 * 当Sql ID 是 default findAll的情况下。
-	 * 
+	 *
 	 * @param params
 	 * @param pageNo
 	 * @param pageSize
-	 * @param requiredType
 	 *            返回的类型[可以不传参]
 	 * @return
 	 */
@@ -160,7 +159,7 @@ public class BaseMybatisDao<T> extends SqlSessionDaoSupport {
 
 	/**
 	 * 分页
-	 * 
+	 *
 	 * @param sqlId
 	 *            主语句
 	 * @param countId
@@ -169,8 +168,6 @@ public class BaseMybatisDao<T> extends SqlSessionDaoSupport {
 	 *            参数
 	 * @param pageNo
 	 *            第几页
-	 * @param pageSize每页显示多少条
-	 * @param requiredType
 	 *            返回的类型[可以不传参]
 	 * @return
 	 */
@@ -178,7 +175,7 @@ public class BaseMybatisDao<T> extends SqlSessionDaoSupport {
 			Integer pageSize) {
 		pageNo = null == pageNo ? 1 : pageNo;
 		pageSize = null == pageSize ? 10 : pageSize;
-		Pagination<?> page = new Pagination<Object>();
+		Pagination<?> page = new Pagination<T>();
 		page.setPageNo(pageNo);
 		page.setPageSize(pageSize);
 		int offset = (page.getPageNo() - 1) * page.getPageSize();
@@ -188,7 +185,7 @@ public class BaseMybatisDao<T> extends SqlSessionDaoSupport {
 		sqlId = String.format("%s.%s", NAMESPACE, sqlId);
 
 		countId = String.format("%s.%s", NAMESPACE, countId);
-		
+
 		try {
 			List<?> resultList = this.getSqlSession().selectList(sqlId, params);
 
@@ -205,7 +202,7 @@ public class BaseMybatisDao<T> extends SqlSessionDaoSupport {
 
 	/**
 	 * 重载减少参数DEFAULT_SQL_ID, "findCount"
-	 * 
+	 *
 	 * @param params
 	 * @param pageNo
 	 * @param pageSize
@@ -218,7 +215,7 @@ public class BaseMybatisDao<T> extends SqlSessionDaoSupport {
 
 	/**
 	 * 组装
-	 * 
+	 *
 	 * @param sql
 	 * @param parameterMappingList
 	 * @param params
@@ -242,6 +239,6 @@ public class BaseMybatisDao<T> extends SqlSessionDaoSupport {
 	}
 
 
-	
+
 
 }

+ 2 - 3
src/main/java/com/goafanti/core/mybatis/JDBCIdGenerator.java

@@ -11,7 +11,7 @@ import com.goafanti.common.utils.LoggerUtils;
 import com.goafanti.common.utils.StringUtils;
 
 /**
- * 
+ *
  * @author xiaolong
  *
  */
@@ -71,7 +71,6 @@ public class JDBCIdGenerator {
 	 *            工作进程Id
 	 */
 	public static void setWorkerId(final Long workerId) {
-		LoggerUtils.debug(logger, "工作进程ID:[%s]", workerId);
 		Assert.isTrue(workerId > 0L && workerId < WORKER_ID_MAX_VALUE, "工作进程ID不能为空,且小于1024");
 		JDBCIdGenerator.workerId = workerId;
 	}
@@ -108,4 +107,4 @@ public class JDBCIdGenerator {
 		}
 		return time;
 	}
-}
+}

+ 3 - 3
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -1864,7 +1864,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 
 	@Override
 	public List<LockingReleaseBo> selectWaitReleaseCustomer(String uid) {
-		List list = new ArrayList();
+		List<LockingReleaseBo> list = new ArrayList<>();
 		List<LockingReleaseBo> lockingReleaseBos = userLockReleaseMapper.selectWaitReleaseCustomer(uid);
 		for (LockingReleaseBo bo : lockingReleaseBos) {
 			if (bo.getChannelType()==null||bo.getChannelType()!=1){
@@ -2417,8 +2417,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		}
 		map.put("shiroType",in.getShiroType());
 
-		Pagination<OutUserMianProducts> p=(Pagination<OutUserMianProducts>) findPage("findMainProductsList","findMainProductsCount",map,in.getPageNo(),in.getPageSize());
-		return p;
+		return (Pagination<OutUserMianProducts>) findPage("findMainProductsList","findMainProductsCount",map,in.getPageNo(),in.getPageSize());
 	}
 
 	@Override
@@ -2487,6 +2486,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 	public Pagination<OutChannelListBo> channelUserList(InputChannelListBo in) {
 		Map<String, Object> params = new HashMap<>();
 		addParams(in, params);
+
 		Pagination<OutChannelListBo> p = (Pagination<OutChannelListBo>) findPage(
 				"channelUserList", "channelUserCout", params, in.getPageNo(),
 				in.getPageSize());

+ 8 - 5
src/main/java/com/goafanti/order/bo/InputTChangeTask.java

@@ -4,8 +4,11 @@ package com.goafanti.order.bo;
 
 import com.goafanti.common.model.TChangeTask;
 
-public class InputTChangeTask  extends TChangeTask{
-	
+
+public class InputTChangeTask  extends TChangeTask {
+
+
+
 	private Integer  splitStatus;
 
 	public Integer getSplitStatus() {
@@ -15,6 +18,6 @@ public class InputTChangeTask  extends TChangeTask{
 	public void setSplitStatus(Integer splitStatus) {
 		this.splitStatus = splitStatus;
 	}
-	
-	
-}
+
+
+}

+ 3 - 1
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -319,7 +319,9 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			if(t.getServiceYear()!=null)ttm.setServiceYear(t.getServiceYear());
 			if(t.getYearSum()!=null)ttm.setYearSum(t.getYearSum());
 			if(t.getContractTerm()!=null)ttm.setContractTerm(t.getContractTerm());
-			tTaskMemberMapper.updateByTid(ttm);
+			if (tTaskMemberMapper.updateByTid(ttm)==0){
+				tTaskMemberMapper.insertSelective(ttm);
+			}
 			//如果是拆分主项目则同时改变子项目
 			if (use.getSplitStatus()==1){
 				tTaskMemberMapper.updateSplitSuper(use.getId(),t.getServiceLife(),t.getServiceYear(),t.getYearSum(),t.getContractTerm());

+ 0 - 72
src/main/java/com/goafanti/order/service/impl/ProjectStatisticsServiceImpl.java

@@ -183,78 +183,6 @@ public class ProjectStatisticsServiceImpl extends BaseMybatisDao<TOrderTaskMappe
 
 
 
-
-	/**
-	 * 处理搜索条件
-	 * @param ib
-	 * @return
-	 */
-	private String getInputString(InputProjectStatistics ib) {
-		String str="搜索条件:";
-		int i=1;
-		if(ib.getStartDate()!=null) {
-			str=StringUtils.join(str,i++,"-派单时间:",ib.getStartDate(),"~",ib.getEndDate(),"   ");
-		}
-
-		if(ib.getScreen()!=null){
-			//筛选项 0库存 1 派单 2 完成 3立项 4抽查 5未通过 6受理 7完结 8授权 9驳回 10下证 11申请
-			String screenName="";
-			if (ib.getScreen()==0)screenName=StringUtils.join("库存");
-			else if (ib.getScreen()==1)screenName=StringUtils.join("派单");
-			else if (ib.getScreen()==2)screenName=StringUtils.join("完成");
-			else if (ib.getScreen()==3)screenName=StringUtils.join("立项");
-			else if (ib.getScreen()==4)screenName=StringUtils.join("抽查");
-			else if (ib.getScreen()==5)screenName=StringUtils.join("未通过");
-			else if (ib.getScreen()==6)screenName=StringUtils.join("受理");
-			else if (ib.getScreen()==7)screenName=StringUtils.join("完结");
-			else if (ib.getScreen()==8)screenName=StringUtils.join("授权");
-			else if (ib.getScreen()==9)screenName=StringUtils.join("驳回");
-			else if (ib.getScreen()==10)screenName=StringUtils.join("下证");
-			else if (ib.getScreen()==11)screenName=StringUtils.join("申请");
-
-			str=StringUtils.join(str,i++,"-筛选分类:",screenName,"   ");
-		}
-		if(ib.getProvinceName()!=null)str=StringUtils.join(str,i++,"-省份:",ib.getProvinceName(),"   ");
-		if(ib.getDeps()!=null)str=StringUtils.join(str,i++,"-订单部门:",ib.getDepName(),"   ");
-		if(ib.getThchDeps()!=null)str=StringUtils.join(str,i++,"-责任部门:",ib.getThchDepName(),"   ");
-		if(ib.getProjectStatus()!=null)str=StringUtils.join(str,i++,"-项目别类:",ib.getProjectStatusName(),"   ");
-		if(ib.getProjectType()!=null)str=StringUtils.join(str,i++,"-项目分类:",ib.getProjectTypeName(),"   ");
-		if(ib.getOrderNo()!=null)str=StringUtils.join(str,i++,"-订单编号:",ib.getOrderNo(),"   ");
-		if(ib.getContractNo()!=null)str=StringUtils.join(str,i++,"-合同编号:",ib.getContractNo(),"   ");
-		if(ib.getUserName()!=null)str=StringUtils.join(str,i++,"-客户名称:",ib.getUserName(),"   ");
-		if(ib.getDeclarationBatch()!=null)str=StringUtils.join(str,i++,"-申报批次:",ib.getDeclarationBatch(),"   ");
-		if(ib.getProjectSituation()!=null) {
-			//0 正常 1专利 2软著 3审计 4双软
-			String str3="";
-			if (ib.getProjectSituation()==0) { str3="通用";
-			}else if (ib.getProjectAmount()==1) { str3="专利";
-			}else if (ib.getProjectAmount()==2) { str3="软著";
-			}else if (ib.getProjectAmount()==3) { str3="审计";
-			}else if (ib.getProjectAmount()==4) { str3="双软";
-			}
-			str=StringUtils.join(str,i++,"-项目情况:",str3,"   ");
-		}
-		if(ib.getProjectAmount()!=null) {
-			String str2="";
-			// 0~0.5万、0.5~1万、1~2万、2~5万、5~10万、10~30万、30~50万、50到80万、80万上
-			if (ib.getProjectAmount()==0) { str2="0~0.5万";
-			}else if (ib.getProjectAmount()==1) { str2="0~0.5万";
-			}else if (ib.getProjectAmount()==2) { str2="0.5~1万";
-			}else if (ib.getProjectAmount()==3) { str2="1~2万";
-			}else if (ib.getProjectAmount()==4) { str2="2~5万";
-			}else if (ib.getProjectAmount()==5) { str2="5~10万";
-			}else if (ib.getProjectAmount()==6) { str2="10~30万";
-			}else if (ib.getProjectAmount()==7) { str2="30~50万";
-			}else if (ib.getProjectAmount()==8) { str2="50到80万";
-			}else if (ib.getProjectAmount()==9) { str2="80万上";
-			}
-			str=StringUtils.join(str,i++,"-项目金额:",str2,"   ");
-		}
-		if(i==1)str=StringUtils.join(str,"无");
-		return str;
-
-	}
-
 	@SuppressWarnings("unchecked")
 	@Override
 	public Pagination<OutProvincialStatistics> selectProvincialStatistics(InputProvincialStatistics is) {

+ 9 - 0
src/main/java/com/goafanti/weChat/bo/OutPublicReleaseList.java

@@ -24,6 +24,15 @@ public class OutPublicReleaseList {
 	private String rejectName;
 	private String assistantAid;
 	private String assistantName;
+	private Integer publicAgain;
+
+	public Integer getPublicAgain() {
+		return publicAgain;
+	}
+
+	public void setPublicAgain(Integer publicAgain) {
+		this.publicAgain = publicAgain;
+	}
 
 	public String getAssistantAid() {
 		return assistantAid;

+ 0 - 2
src/main/java/com/goafanti/weChat/controller/AdminReleaseApiController.java

@@ -1,7 +1,6 @@
 package com.goafanti.weChat.controller;
 
 
-import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -64,7 +63,6 @@ public class AdminReleaseApiController extends CertifyApiController{
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"协单人员"));
 			return res;
 		}
-
 		res.setData(publicReleaseService.addPublicRelease(in));
 		return res;
 	}

+ 1 - 0
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -76,6 +76,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 	@Override
 	public Map<String, Object> addPublicRelease(InputPublicRelease in) {
 		Date date =new Date();
+		if (in.getPublicAgain()==null)in.setPublicAgain(0);
 		in.setCreateTime(date);
 		in.setStatus(1);
 		in.setAid(TokenManager.getAdminId());

+ 1 - 1
src/main/resources/props/config_local.properties

@@ -46,7 +46,7 @@ user_remind_days=15
 user_channel_days=90
 
 avatar.host=//static.jishutao.com
-static.host=//static.jishutao.com/1.2.38
+static.host=//static.jishutao.com/1.2.39
 #avatar.host=//172.16.0.255:3000
 #static.host=//172.16.0.255:3000/1.2.27
 #static.host=http://172.16.1.187/prod/1.2.25

+ 1 - 1
src/main/resources/props/config_test.properties

@@ -43,7 +43,7 @@ user_remind_days=15
 #\u63D0\u524D\u63D0\u9192\u5929\u6570
 user_channel_days=90
 
-static.host=//static.jishutao.com/1.2.38
+static.host=//static.jishutao.com/1.2.39
 portal.host=//static.jishutao.com/portal/2.0.6
 avatar.host=//static.jishutao.com
 avatar.upload.host=//static.jishutao.com/upload