Browse Source

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

anderx 2 years ago
parent
commit
a9c268a581

+ 7 - 0
pom.xml

@@ -431,6 +431,13 @@
 			<version>5.2.0</version>
 		</dependency>
 
+		<!-- 图片缩略图 -->
+		<dependency>
+			<groupId>net.coobird</groupId>
+			<artifactId>thumbnailator</artifactId>
+			<version>0.4.8</version>
+		</dependency>
+
 
 
 	</dependencies>

+ 9 - 0
src/main/java/com/goafanti/RD/bo/InputRdList.java

@@ -5,9 +5,18 @@ public class InputRdList {
     private String rdEnd;
     private String rdName;
     private String rdNo;
+    private String consultantName;
     private Integer pageSize;
     private Integer pageNo;
 
+    public String getConsultantName() {
+        return consultantName;
+    }
+
+    public void setConsultantName(String consultantName) {
+        this.consultantName = consultantName;
+    }
+
     public String getRdNo() {
         return rdNo;
     }

+ 1 - 0
src/main/java/com/goafanti/RD/service/impl/RDServiceImpl.java

@@ -79,6 +79,7 @@ public class RDServiceImpl extends BaseMybatisDao<RdDetailsMapper> implements RD
         param.put("RdNo", in.getRdNo());
         param.put("RdEnd", in.getRdEnd());
         param.put("RdName", in.getRdName());
+        param.put("consultantName", in.getConsultantName());
         if (TokenManager.hasRole(AFTConstants.SUPERADMIN)||TokenManager.hasRole(AFTConstants.APPROVAL_DECISION_ASSISTANT)||TokenManager.hasRole(AFTConstants.CED)){
 
         }else {

+ 36 - 14
src/main/java/com/goafanti/common/controller/BaseApiController.java

@@ -1,15 +1,11 @@
 package com.goafanti.common.controller;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import com.goafanti.common.bo.Result;
+import com.goafanti.common.utils.FileUtils;
+import com.goafanti.common.utils.LoggerUtils;
+import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.order.enums.OrderImgEnums;
+import net.coobird.thumbnailator.Thumbnails;
 import org.apache.commons.fileupload.servlet.ServletFileUpload;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
@@ -18,10 +14,13 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartRequest;
 
-import com.goafanti.common.bo.Result;
-import com.goafanti.common.utils.FileUtils;
-import com.goafanti.common.utils.LoggerUtils;
-import com.goafanti.core.shiro.token.TokenManager;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
 
 @RestController
 @RequestMapping(value = "/api")
@@ -85,7 +84,9 @@ public class BaseApiController extends BaseController {
 			try {
 				MultipartFile mf = files.get(0);
 				fileName = FileUtils.orderFileName(mf,id,path,sign);
-				mf.transferTo(toFile(fileName));
+				File file=toFile(fileName);
+				mf.transferTo(file);
+//				fileName=compressFile(file,fileName);
 				LoggerUtils.debug(getClass(), fileName + " 文件上传成功");
 			} catch (Exception e) {
 				LoggerUtils.error(getClass(), "文件上传失败", e);
@@ -97,6 +98,27 @@ public class BaseApiController extends BaseController {
 		return fileName;
 	}
 
+	/**
+	 * 图片压缩
+	 * @param file
+	 * @param fileName
+	 * @return
+	 * @throws IOException
+	 */
+	private String compressFile(File file, String fileName) throws IOException {
+		if (fileName.contains("jpg")||fileName.contains("jpeg")||fileName.contains("bmp")
+				||fileName.contains("png")){
+			String thumbnailFilePathName = fileName.substring(0, fileName.lastIndexOf(".")) + "_min"+fileName.substring(fileName.lastIndexOf("."));
+			double scale = 0.4d ;
+			Thumbnails.of(file).scale(1f).outputQuality(scale)
+					.outputFormat("jpg")
+					.toFile(uploadPath+thumbnailFilePathName);
+			FileUtils.deleteFile(uploadPath+fileName);
+			return thumbnailFilePathName;
+		}
+		return fileName;
+	}
+
 	protected Result deleteFile (Result res,String fileName){
 		if (StringUtils.isBlank(fileName)) {
 			res.getError().add(buildError("文件路径错误"));

+ 2 - 0
src/main/java/com/goafanti/common/dao/TOrderNewMapper.java

@@ -81,4 +81,6 @@ public interface TOrderNewMapper {
     List<StatisOrderList>  statisticsOrderList(InputStatistics in);
 
     List<UserOrder>  matchingOrderNoOrUserName(@Param("orderNo") String orderNo, @Param("userName")String userName);
+
+    void updateTagByListOrderNo(List<String> orderNos, Integer tag);
 }

+ 6 - 0
src/main/java/com/goafanti/common/mapper/RdDetailsMapper.xml

@@ -310,6 +310,9 @@
     <if test="RdNo !=null ">
       and a.rd_no like concat('%',#{RdNo},'%')
     </if>
+    <if test="consultantName !=null">
+      and a.consultant_name like concat('%',#{consultantName},'%')
+    </if>
     <if test="aid !=null ">
       and a.aid =#{aid}
     </if>
@@ -331,6 +334,9 @@
     <if test="RdNo !=null ">
       and a.rd_no like concat('%',#{RdNo},'%')
     </if>
+    <if test="consultantName !=null">
+      and a.consultant_name like concat('%',#{consultantName},'%')
+    </if>
     <if test="aid !=null ">
       and a.aid =#{aid}
     </if>

+ 32 - 6
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -49,6 +49,7 @@
     <result column="other" jdbcType="VARCHAR" property="other" />
     <result column="user_type" jdbcType="INTEGER" property="userType" />
     <result column="examine_name" jdbcType="VARCHAR" property="examineName" />
+    <result column="tag" jdbcType="INTEGER" property="tag" />
   </resultMap>
   <sql id="Base_Column_List">
     order_no, order_type, creater, create_time, update_time, buyer_id, first_amount,
@@ -58,7 +59,7 @@
     contract_type, contacts, contact_mobile, legal_person, legal_person_tel, proof_count,
     proof_aid, proof_time, proof_status, order_dep, outsource, additional_order, primary_order,
     old_salesman_id, back_status, agreement_url, new_user, service_content, sales_type,
-    channel_id, other, user_type, examine_name
+    channel_id, other, user_type, examine_name, tag
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
     select
@@ -86,7 +87,8 @@
       primary_order, old_salesman_id, back_status,
       agreement_url, new_user, service_content,
       sales_type, channel_id, other,
-      user_type, examine_name)
+      user_type, examine_name, tag
+      )
     values (#{orderNo,jdbcType=VARCHAR}, #{orderType,jdbcType=INTEGER}, #{creater,jdbcType=VARCHAR},
       #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{buyerId,jdbcType=VARCHAR},
       #{firstAmount,jdbcType=DECIMAL}, #{totalAmount,jdbcType=DECIMAL}, #{settlementAmount,jdbcType=DECIMAL},
@@ -102,7 +104,8 @@
       #{primaryOrder,jdbcType=VARCHAR}, #{oldSalesmanId,jdbcType=VARCHAR}, #{backStatus,jdbcType=INTEGER},
       #{agreementUrl,jdbcType=VARCHAR}, #{newUser,jdbcType=INTEGER}, #{serviceContent,jdbcType=VARCHAR},
       #{salesType,jdbcType=INTEGER}, #{channelId,jdbcType=VARCHAR}, #{other,jdbcType=VARCHAR},
-      #{userType,jdbcType=INTEGER}, #{examineName,jdbcType=VARCHAR})
+      #{userType,jdbcType=INTEGER}, #{examineName,jdbcType=VARCHAR}, #{tag,jdbcType=INTEGER}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.TOrderNew">
     insert into t_order_new
@@ -248,6 +251,9 @@
       <if test="examineName != null">
         examine_name,
       </if>
+      <if test="tag != null">
+        tag,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="orderNo != null">
@@ -391,6 +397,9 @@
       <if test="examineName != null">
         #{examineName,jdbcType=VARCHAR},
       </if>
+      <if test="tag != null">
+        #{tag,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.TOrderNew">
@@ -534,6 +543,9 @@
       <if test="examineName != null">
         examine_name = #{examineName,jdbcType=VARCHAR},
       </if>
+      <if test="tag != null">
+        tag = #{tag,jdbcType=INTEGER},
+      </if>
     </set>
     where order_no = #{orderNo,jdbcType=VARCHAR}
   </update>
@@ -584,7 +596,8 @@
       channel_id = #{channelId,jdbcType=VARCHAR},
       other = #{other,jdbcType=VARCHAR},
       user_type = #{userType,jdbcType=INTEGER},
-      examine_name = #{examineName,jdbcType=VARCHAR}
+      examine_name = #{examineName,jdbcType=VARCHAR},
+      tag = #{tag,jdbcType=INTEGER}
     where order_no = #{orderNo,jdbcType=VARCHAR}
   </update>
 
@@ -932,7 +945,7 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
 
   <select id="selectOrderNewListByPage" resultType="com.goafanti.order.bo.TOrderNewBo">
   	select a.order_no as orderNo,a.create_time as createTime, date_format(a.sign_time,'%Y-%m-%d' ) as signDate,a.delete_sign deleteSign,
-  	a.contract_no as contractNo, b.nickname as userName ,a.process_status as processStatus,a.total_amount as totalAmount,
+  	a.contract_no as contractNo, b.nickname as userName ,a.process_status as processStatus,a.total_amount as totalAmount,a.tag,
   	a.order_status as orderStatus, a.liquidation_status as liquidationStatus,a.approval,c.salesman_name as salesmanName,c.project_type projectType,
   	dep.name as depName,c.finance_name as financeName,c.invoice_amount invoiceAmount,a.settlement_amount settlementAmount,
     a.sales_type salesType, a.channel_id channelId ,a.other,a.examine_name examineName,c.stop_project stopProject
@@ -1077,6 +1090,9 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
   	<if test="liquidationStatus != null">
   	and a.liquidation_status = #{liquidationStatus,jdbcType=INTEGER}
   	</if>
+    <if test="tag != null">
+    and a.tag= #{tag}
+    </if>
   	<if test="amountStatus == 0">
   	and a.total_amount &lt; 10
   	</if>
@@ -1246,6 +1262,9 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
   	<if test="liquidationStatus != null">
   	and a.liquidation_status = #{liquidationStatus,jdbcType=INTEGER}
   	</if>
+     <if test="tag != null">
+       and a.tag= #{tag}
+     </if>
   	<if test="amountStatus == 0">
   	and a.total_amount &lt; 10
   	</if>
@@ -2099,6 +2118,13 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
     </if>
     limit 0,20
   </select>
-
+  <update id="updateTagByListOrderNo">
+    update t_order_new
+    set tag = #{param2}
+    where order_no in
+    <foreach collection="param1" item="e" open="(" close=")" separator=",">
+       #{e}
+    </foreach>
+  </update>
 
 </mapper>

+ 201 - 189
src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml

@@ -797,6 +797,206 @@
     where id = #{id,jdbcType=INTEGER}
   </update>
 
+
+
+
+
+  <update id="updateBySuperId">
+    update t_order_task
+    <set>
+      <if test="orderNo != null">
+        order_no = #{orderNo,jdbcType=VARCHAR},
+      </if>
+      <if test="main != null">
+        main = #{main,jdbcType=INTEGER},
+      </if>
+      <if test="superId != null">
+        super_id = #{superId,jdbcType=VARCHAR},
+      </if>
+      <if test="commodityId != null">
+        commodity_id = #{commodityId,jdbcType=VARCHAR},
+      </if>
+      <if test="commodityName != null">
+        commodity_name = #{commodityName,jdbcType=VARCHAR},
+      </if>
+      <if test="commodityQuantity != null">
+        commodity_quantity = #{commodityQuantity,jdbcType=INTEGER},
+      </if>
+      <if test="commodityMode != null">
+        commodity_mode = #{commodityMode,jdbcType=VARCHAR},
+      </if>
+      <if test="commodityPrice != null">
+        commodity_price = #{commodityPrice,jdbcType=DECIMAL},
+      </if>
+      <if test="taskStatus != null">
+        task_status = #{taskStatus,jdbcType=INTEGER},
+      </if>
+      <if test="taskDistributionTime != null">
+        task_distribution_time = #{taskDistributionTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="taskAllocator != null">
+        task_allocator = #{taskAllocator,jdbcType=VARCHAR},
+      </if>
+      <if test="taskReceiver != null">
+        task_receiver = #{taskReceiver,jdbcType=VARCHAR},
+      </if>
+      <if test="taskComment != null">
+        task_comment = #{taskComment,jdbcType=VARCHAR},
+      </if>
+      <if test="taskStartTime != null">
+        task_start_time = #{taskStartTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="taskEndTime != null">
+        task_end_time = #{taskEndTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="attachmentUrl != null">
+        attachment_url = #{attachmentUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="projectStatus != null">
+        project_status = #{projectStatus,jdbcType=INTEGER},
+      </if>
+      <if test="acceptTime != null">
+        accept_time = #{acceptTime,jdbcType=DATE},
+      </if>
+      <if test="reviewTime != null">
+        review_time = #{reviewTime,jdbcType=DATE},
+      </if>
+      <if test="publicityTime != null">
+        publicity_time = #{publicityTime,jdbcType=DATE},
+      </if>
+      <if test="licenceTime != null">
+        licence_time = #{licenceTime,jdbcType=DATE},
+      </if>
+      <if test="certificateNumber != null">
+        certificate_number = #{certificateNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        `status` = #{status,jdbcType=INTEGER},
+      </if>
+      <if test="formRetrieve != null">
+        form_retrieve = #{formRetrieve,jdbcType=INTEGER},
+      </if>
+      <if test="taskRefund != null">
+        task_refund = #{taskRefund,jdbcType=INTEGER},
+      </if>
+      <if test="refundContent != null">
+        refund_content = #{refundContent,jdbcType=VARCHAR},
+      </if>
+      <if test="retrieveContent != null">
+        retrieve_content = #{retrieveContent,jdbcType=VARCHAR},
+      </if>
+      <if test="declareUser != null">
+        declare_user = #{declareUser,jdbcType=VARCHAR},
+      </if>
+      <if test="declarePwd != null">
+        declare_pwd = #{declarePwd,jdbcType=VARCHAR},
+      </if>
+      <if test="setUpAmount != null">
+        set_up_amount = #{setUpAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="arrivalMoney != null">
+        arrival_money = #{arrivalMoney,jdbcType=INTEGER},
+      </if>
+      <if test="outsourceName != null">
+        outsource_name = #{outsourceName,jdbcType=VARCHAR},
+      </if>
+      <if test="outsourcePrice != null">
+        outsource_price = #{outsourcePrice,jdbcType=DECIMAL},
+      </if>
+      <if test="consultantId != null">
+        consultant_id = #{consultantId,jdbcType=VARCHAR},
+      </if>
+      <if test="managerId != null">
+        manager_id = #{managerId,jdbcType=VARCHAR},
+      </if>
+      <if test="outsource != null">
+        outsource = #{outsource,jdbcType=INTEGER},
+      </if>
+      <if test="splitStatus != null">
+        split_status = #{splitStatus,jdbcType=INTEGER},
+      </if>
+      <if test="splitId != null">
+        split_id = #{splitId,jdbcType=INTEGER},
+      </if>
+      <if test="splitAid != null">
+        split_aid = #{splitAid,jdbcType=VARCHAR},
+      </if>
+      <if test="splitTime != null">
+        split_time = #{splitTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="cname != null">
+        cname = #{cname,jdbcType=VARCHAR},
+      </if>
+      <if test="receiverName != null">
+        receiver_name = #{receiverName,jdbcType=VARCHAR},
+      </if>
+      <if test="declarationBatch != null">
+        declaration_batch = #{declarationBatch,jdbcType=INTEGER},
+      </if>
+      <if test="costReduction != null">
+        cost_reduction = #{costReduction,jdbcType=INTEGER},
+      </if>
+      <if test="officialCost != null">
+        official_cost = #{officialCost,jdbcType=INTEGER},
+      </if>
+      <if test="setUpStatus != null">
+        set_up_status = #{setUpStatus,jdbcType=INTEGER},
+      </if>
+      <if test="setUpTime != null">
+        set_up_time = #{setUpTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="spotCheckStatus != null">
+        spot_check_status = #{spotCheckStatus,jdbcType=INTEGER},
+      </if>
+      <if test="highTechStatus != null">
+        high_tech_status = #{highTechStatus,jdbcType=INTEGER},
+      </if>
+      <if test="specialComment != null">
+        special_comment = #{specialComment,jdbcType=VARCHAR},
+      </if>
+      <if test="ifCertificationFee != null">
+        if_certification_fee = #{ifCertificationFee,jdbcType=INTEGER},
+      </if>
+      <if test="certificationFee != null">
+        certification_fee = #{certificationFee,jdbcType=DECIMAL},
+      </if>
+      <if test="certificationCorporate != null">
+        certification_corporate = #{certificationCorporate,jdbcType=VARCHAR},
+      </if>
+      <if test="timeRecord != null">
+        time_record = #{timeRecord,jdbcType=VARCHAR},
+      </if>
+      <if test="ifPublicity != null">
+        if_publicity = #{ifPublicity,jdbcType=INTEGER},
+      </if>
+      <if test="checkStatus != null">
+        check_status = #{checkStatus,jdbcType=INTEGER},
+      </if>
+      <if test="patentType != null">
+        patent_type = #{patentType,jdbcType=INTEGER},
+      </if>
+      <if test="pubicityUrl != null">
+        pubicity_url = #{pubicityUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="processStatus != null">
+        process_status = #{processStatus,jdbcType=INTEGER},
+      </if>
+      <if test="memberType != null">
+        member_type = #{memberType,jdbcType=INTEGER},
+      </if>
+      <if test="pictureUrl != null">
+        picture_url = #{pictureUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="satisfactionDegree != null">
+        satisfaction_degree = #{satisfactionDegree,jdbcType=INTEGER},
+      </if>
+      <if test="satisfactionDegreeUrl != null">
+        satisfaction_degree_url = #{satisfactionDegreeUrl,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where split_super = #{splitSuper,jdbcType=INTEGER}
+  </update>
+
   <select id="selectOrderTask" resultType="com.goafanti.order.bo.TOrderTaskBo">
     select a.id,e.contract_no contractNo,a.order_no as orderNo,h.nickname userName,f.name salesmanName,
     a.outsource_name outsourceName,a.outsource, a.outsource_price outsourcePrice,g.name depName,
@@ -2171,195 +2371,7 @@
     </if>
   </select>
 
-  <update id="updateBySuperId">
-    update t_order_task
-    <set>
-      <if test="orderNo != null">
-        order_no = #{orderNo,jdbcType=VARCHAR},
-      </if>
-      <if test="main != null">
-        main = #{main,jdbcType=INTEGER},
-      </if>
-      <if test="superId != null">
-        super_id = #{superId,jdbcType=VARCHAR},
-      </if>
-      <if test="commodityId != null">
-        commodity_id = #{commodityId,jdbcType=VARCHAR},
-      </if>
-      <if test="commodityName != null">
-        commodity_name = #{commodityName,jdbcType=VARCHAR},
-      </if>
-      <if test="commodityQuantity != null">
-        commodity_quantity = #{commodityQuantity,jdbcType=INTEGER},
-      </if>
-      <if test="commodityMode != null">
-        commodity_mode = #{commodityMode,jdbcType=VARCHAR},
-      </if>
-      <if test="commodityPrice != null">
-        commodity_price = #{commodityPrice,jdbcType=DECIMAL},
-      </if>
-      <if test="taskStatus != null">
-        task_status = #{taskStatus,jdbcType=INTEGER},
-      </if>
-      <if test="taskDistributionTime != null">
-        task_distribution_time = #{taskDistributionTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="taskAllocator != null">
-        task_allocator = #{taskAllocator,jdbcType=VARCHAR},
-      </if>
-      <if test="taskReceiver != null">
-        task_receiver = #{taskReceiver,jdbcType=VARCHAR},
-      </if>
-      <if test="taskComment != null">
-        task_comment = #{taskComment,jdbcType=VARCHAR},
-      </if>
-      <if test="taskStartTime != null">
-        task_start_time = #{taskStartTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="taskEndTime != null">
-        task_end_time = #{taskEndTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="attachmentUrl != null">
-        attachment_url = #{attachmentUrl,jdbcType=VARCHAR},
-      </if>
-      <if test="projectStatus != null">
-        project_status = #{projectStatus,jdbcType=INTEGER},
-      </if>
-      <if test="acceptTime != null">
-        accept_time = #{acceptTime,jdbcType=DATE},
-      </if>
-      <if test="reviewTime != null">
-        review_time = #{reviewTime,jdbcType=DATE},
-      </if>
-      <if test="publicityTime != null">
-        publicity_time = #{publicityTime,jdbcType=DATE},
-      </if>
-      <if test="licenceTime != null">
-        licence_time = #{licenceTime,jdbcType=DATE},
-      </if>
-      <if test="certificateNumber != null">
-        certificate_number = #{certificateNumber,jdbcType=VARCHAR},
-      </if>
-      <if test="status != null">
-        `status` = #{status,jdbcType=INTEGER},
-      </if>
-      <if test="formRetrieve != null">
-        form_retrieve = #{formRetrieve,jdbcType=INTEGER},
-      </if>
-      <if test="taskRefund != null">
-        task_refund = #{taskRefund,jdbcType=INTEGER},
-      </if>
-      <if test="refundContent != null">
-        refund_content = #{refundContent,jdbcType=VARCHAR},
-      </if>
-      <if test="retrieveContent != null">
-        retrieve_content = #{retrieveContent,jdbcType=VARCHAR},
-      </if>
-      <if test="declareUser != null">
-        declare_user = #{declareUser,jdbcType=VARCHAR},
-      </if>
-      <if test="declarePwd != null">
-        declare_pwd = #{declarePwd,jdbcType=VARCHAR},
-      </if>
-      <if test="setUpAmount != null">
-        set_up_amount = #{setUpAmount,jdbcType=DECIMAL},
-      </if>
-      <if test="arrivalMoney != null">
-        arrival_money = #{arrivalMoney,jdbcType=INTEGER},
-      </if>
-      <if test="outsourceName != null">
-        outsource_name = #{outsourceName,jdbcType=VARCHAR},
-      </if>
-      <if test="outsourcePrice != null">
-        outsource_price = #{outsourcePrice,jdbcType=DECIMAL},
-      </if>
-      <if test="consultantId != null">
-        consultant_id = #{consultantId,jdbcType=VARCHAR},
-      </if>
-      <if test="managerId != null">
-        manager_id = #{managerId,jdbcType=VARCHAR},
-      </if>
-      <if test="outsource != null">
-        outsource = #{outsource,jdbcType=INTEGER},
-      </if>
-      <if test="splitStatus != null">
-        split_status = #{splitStatus,jdbcType=INTEGER},
-      </if>
-      <if test="splitId != null">
-        split_id = #{splitId,jdbcType=INTEGER},
-      </if>
-      <if test="splitAid != null">
-        split_aid = #{splitAid,jdbcType=VARCHAR},
-      </if>
-      <if test="splitTime != null">
-        split_time = #{splitTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="cname != null">
-        cname = #{cname,jdbcType=VARCHAR},
-      </if>
-      <if test="receiverName != null">
-        receiver_name = #{receiverName,jdbcType=VARCHAR},
-      </if>
-      <if test="declarationBatch != null">
-        declaration_batch = #{declarationBatch,jdbcType=INTEGER},
-      </if>
-      <if test="costReduction != null">
-        cost_reduction = #{costReduction,jdbcType=INTEGER},
-      </if>
-      <if test="officialCost != null">
-        official_cost = #{officialCost,jdbcType=INTEGER},
-      </if>
-      <if test="setUpStatus != null">
-        set_up_status = #{setUpStatus,jdbcType=INTEGER},
-      </if>
-      <if test="setUpTime != null">
-        set_up_time = #{setUpTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="spotCheckStatus != null">
-        spot_check_status = #{spotCheckStatus,jdbcType=INTEGER},
-      </if>
-      <if test="highTechStatus != null">
-        high_tech_status = #{highTechStatus,jdbcType=INTEGER},
-      </if>
-      <if test="specialComment != null">
-        special_comment = #{specialComment,jdbcType=VARCHAR},
-      </if>
-      <if test="ifCertificationFee != null">
-        if_certification_fee = #{ifCertificationFee,jdbcType=INTEGER},
-      </if>
-      <if test="certificationFee != null">
-        certification_fee = #{certificationFee,jdbcType=DECIMAL},
-      </if>
-      <if test="certificationCorporate != null">
-        certification_corporate = #{certificationCorporate,jdbcType=VARCHAR},
-      </if>
-      <if test="timeRecord != null">
-        time_record = #{timeRecord,jdbcType=VARCHAR},
-      </if>
-      <if test="ifPublicity != null">
-        if_publicity = #{ifPublicity,jdbcType=INTEGER},
-      </if>
-      <if test="checkStatus != null">
-        check_status = #{checkStatus,jdbcType=INTEGER},
-      </if>
-      <if test="patentType != null">
-        patent_type = #{patentType,jdbcType=INTEGER},
-      </if>
-      <if test="pubicityUrl != null">
-        pubicity_url = #{pubicityUrl,jdbcType=VARCHAR},
-      </if>
-      <if test="processStatus != null">
-        process_status = #{processStatus,jdbcType=INTEGER},
-      </if>
-      <if test="memberType != null">
-        member_type = #{memberType,jdbcType=INTEGER},
-      </if>
-      <if test="pictureUrl != null">
-        picture_url = #{pictureUrl,jdbcType=VARCHAR},
-      </if>
-    </set>
-    where split_super = #{splitSuper,jdbcType=INTEGER}
-  </update>
+
 
   <delete id="deleteBySplitId" parameterType="java.lang.Integer">
     delete from t_order_task

+ 14 - 1
src/main/java/com/goafanti/common/model/TOrderNew.java

@@ -70,7 +70,7 @@ public class TOrderNew implements Serializable {
     private Integer liquidationStatus;
 
     /**
-     * 流程状态 0-已派营销员,1-已派营销员管理员,2-已派财务管理员,3-已派财务专员,4-已派咨询师管理员,5-已部分派咨询师经理,6-已部全部派咨询师经理
+     * 流程状态 0=营销员,1=经理,2=营销管理员,3=财务与技术总监,4=总裁,5=技术总监派单,6部分分配,7全部分配
      */
     private Integer processStatus;
 
@@ -244,6 +244,11 @@ public class TOrderNew implements Serializable {
      */
     private String examineName;
 
+    /**
+     * 标签 0=默认,1=待处理,2=待派单,3=暂不处理,4=已过期,已作废
+     */
+    private Integer tag;
+
     private static final long serialVersionUID = 1L;
 
     public String getOrderNo() {
@@ -621,4 +626,12 @@ public class TOrderNew implements Serializable {
     public void setExamineName(String examineName) {
         this.examineName = examineName;
     }
+
+    public Integer getTag() {
+        return tag;
+    }
+
+    public void setTag(Integer tag) {
+        this.tag = tag;
+    }
 }

+ 9 - 0
src/main/java/com/goafanti/order/bo/InputOrderNewListBo.java

@@ -23,9 +23,18 @@ public class InputOrderNewListBo {
     private String uid;
     private Integer projectType;
     private Integer processStatus;
+    private Integer tag;
     private  Integer pageNo;
     private Integer pageSize;
 
+    public Integer getTag() {
+        return tag;
+    }
+
+    public void setTag(Integer tag) {
+        this.tag = tag;
+    }
+
     public String getDeps() {
         return deps;
     }

+ 20 - 0
src/main/java/com/goafanti/order/controller/AdminNewOrderApiController.java

@@ -849,6 +849,26 @@ public class AdminNewOrderApiController extends CertifyApiController {
 		return res.data(orderNewService.updateOrderUrl(orderNo,contractPictureUrl,agreementUrl,serviceContent));
 	}
 
+	/**
+	 * 修改订单的标签
+	 * @param orderNo  订单编号,可传多个逗号隔开
+	 * @param tag   标签 0=默认,1=待处理,2=待派单,3=暂不处理,4=已过期,5=已作废
+	 * @return
+	 */
+	@RequestMapping(value = "/updateTag",method = RequestMethod.POST)
+	public Result updateTag(String orderNo,Integer tag){
+		Result res=new Result();
+		if (orderNo==null){
+			res.getError().add(buildErrorMessageParams(ErrorConstants.PARAM_EMPTY_ERROR,"订单编号"));
+			return res;
+		}
+		if (tag==null){
+			res.getError().add(buildErrorMessageParams(ErrorConstants.PARAM_EMPTY_ERROR,"项目标签"));
+			return res;
+		}
+		return res.data(orderNewService.updateTag(orderNo,tag));
+	}
+
 
 
 }

+ 21 - 22
src/main/java/com/goafanti/order/controller/OrderProjectApiController.java

@@ -1,22 +1,20 @@
 package com.goafanti.order.controller;
 
 
-import java.io.IOException;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-
-import com.goafanti.common.model.TOrderTask;
+import com.goafanti.common.bo.Result;
+import com.goafanti.common.constant.AFTConstants;
+import com.goafanti.common.constant.ErrorConstants;
+import com.goafanti.common.controller.CertifyApiController;
+import com.goafanti.common.enums.OfficialPatentType;
+import com.goafanti.common.model.TTaskHours;
 import com.goafanti.common.utils.ParamUtils;
+import com.goafanti.common.utils.StringUtils;
+import com.goafanti.common.utils.excel.NewExcelUtil;
 import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.order.bo.*;
 import com.goafanti.order.service.OrderNewService;
+import com.goafanti.order.service.OrderProjectService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -26,16 +24,14 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.goafanti.common.bo.Result;
-import com.goafanti.common.constant.AFTConstants;
-import com.goafanti.common.constant.ErrorConstants;
-import com.goafanti.common.controller.CertifyApiController;
-import com.goafanti.common.enums.OfficialPatentType;
-import com.goafanti.common.model.TTaskHours;
-import com.goafanti.common.utils.StringUtils;
-import com.goafanti.common.utils.excel.NewExcelUtil;
-import com.goafanti.core.shiro.token.TokenManager;
-import com.goafanti.order.service.OrderProjectService;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.io.IOException;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.List;
 
 @RestController
 @RequestMapping(value = "/api/admin/orderProject")
@@ -802,4 +798,7 @@ public class OrderProjectApiController extends CertifyApiController {
 
 
 
+
+
+
 }

+ 2 - 0
src/main/java/com/goafanti/order/service/OrderNewService.java

@@ -219,4 +219,6 @@ public interface OrderNewService {
     OrderProcessName getProcessName(String orderNo);
 
 	 void addTTaskMember(Integer id, String serviceLife, String serviceYear, Integer yearSum, String contractTerm);
+
+	int updateTag(String orderNo, Integer tag);
 }

+ 3 - 3
src/main/java/com/goafanti/order/service/OrderProjectService.java

@@ -1,17 +1,16 @@
 package com.goafanti.order.service;
 
-import java.util.List;
-
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.bo.UserOrderTask;
 import com.goafanti.common.model.TOrderTask;
 import com.goafanti.common.model.TTaskHours;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.order.bo.*;
-import com.goafanti.order.bo.InputProjectCheck;
 import com.goafanti.order.controller.InputTaskStopLog;
 import com.goafanti.organization.bo.OutPaymentNode;
 
+import java.util.List;
+
 public interface OrderProjectService {
 
 	/**
@@ -148,4 +147,5 @@ public interface OrderProjectService {
 
 
     Object updateSatisfactionDegree(Integer id, Integer formRetrieve, Integer satisfactionDegree, String satisfactionDegreeUrl);
+
 }

+ 14 - 0
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -255,6 +255,17 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	}
 
 	@Override
+	public int updateTag(String orderNo, Integer tag) {
+		String[] str= orderNo.split(",");
+		if(str.length>0){
+			List<String> orderNos= Arrays.asList(str);
+			tOrderNewMapper.updateTagByListOrderNo(orderNos,tag);
+			return 1;
+		}
+		return 0;
+	}
+
+	@Override
 	public int addTaskMid(Integer id, String commodityId, String orderNo) {
 		InputAddTask t = new InputAddTask();
 		t.setId(id);
@@ -910,6 +921,9 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		if(null != in.getProcessStatus()) {
 			params.put("processStatus", in.getProcessStatus());
 		}
+		if(null != in.getTag()){
+			params.put("tag",in.getTag());
+		}
 		params.put("outsource", in.getOutsource());
 		return null;
 	}

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

@@ -52,8 +52,8 @@ yxjl_max=100
 amb.maxLvl=6
 
 avatar.host=//static.jishutao.com
-static.host=//static.jishutao.com/1.2.74
-rd.static.host=//static.jishutao.com/RD/1.0.00
+static.host=//static.jishutao.com/1.2.76
+rd.static.host=//static.jishutao.com/RD/1.0.01
 #avatar.host=//172.16.0.255:3000
 #static.host=//172.16.0.255:3000/1.2.62
 #static.host=http://172.16.1.187/prod/1.2.66

+ 3 - 2
src/main/resources/props/config_test.properties

@@ -49,10 +49,11 @@ yxjl_max=100
 
 amb.maxLvl=6
 
-static.host=//static.jishutao.com/1.2.74
+
 portal.host=//static.jishutao.com/portal/2.0.6
 avatar.host=//static.jishutao.com
-rd.static.host=//static.jishutao.com/RD/1.0.00
+static.host=//static.jishutao.com/1.2.76
+rd.static.host=//static.jishutao.com/RD/1.0.01
 avatar.upload.host=//static.jishutao.com/upload
 
 wx.appId=wxff2f5720ed7d7f63

+ 2 - 2
src/main/resources/spring/spring-mvc.xml

@@ -118,8 +118,8 @@
 	<bean id="multipartResolver"
 		class="org.springframework.web.multipart.commons.CommonsMultipartResolver">
 		<property name="defaultEncoding" value="UTF-8" />
-		<!-- 不限制图片上传大小 -1 不限制  -->
-		<property name="maxUploadSize" value="10485760" />
+		<!-- 不限制图片上传大小 -1 不限制  20971520-->
+		<property name="maxUploadSize" value="20971520" />
 	</bean>
 
 	<bean