anderx 4 years ago
parent
commit
fb4608e49b

+ 16 - 0
.vscode/launch.json

@@ -0,0 +1,16 @@
+// Use IntelliSense to learn about possible attributes.
+// Hover to view descriptions of existing attributes.
+// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "Launch Chrome 127.0.0.1",
+      "type": "chrome",
+      "request": "launch",
+      "port": 9276,
+      "webRoot": "${workspaceFolder}",
+      "url": "http://127.0.0.1:50939/p/kede-server/src/main/webapp/WEB-INF/views/common.html?_cmAuth\u003dxdspwawfnr"
+    }
+  ]
+}

+ 3 - 1
GeneratorConfig.xml

@@ -11,6 +11,7 @@
         <!-- beginningDelimiter和endingDelimiter:指明数据库的用于标记数据库对象名的符号,比如ORACLE就是双引号,MYSQL默认是`反引号; -->
         <property name="beginningDelimiter" value="`"/>
         <property name="endingDelimiter" value="`"/>
+        <property name="addRemarkComments" value="true"/>
         <!-- 格式化XML代码 -->
         <property name="xmlFormatter" value="org.mybatis.generator.api.dom.DefaultXmlFormatter"/>
         <plugin type="org.mybatis.generator.plugins.SerializablePlugin"/>
@@ -19,6 +20,7 @@
         <commentGenerator>
             <property name="suppressAllComments" value="false"/><!-- 是否取消注释 -->
             <property name="suppressDate" value="false"/> <!-- 是否生成注释代时间戳-->
+            <property name="addRemarkComments" value="true"/> 
         </commentGenerator>
      <jdbcConnection connectionURL="jdbc:mysql://localhost:3306/aft?serverTimezone=UTC"  
     	driverClass="com.mysql.jdbc.Driver" password="123456" userId="root" >
@@ -43,7 +45,7 @@
     <property name="enableSubPackages" value="false"/>
      <property name="nullCatalogMeansCurrent" value="true"/>
     </javaClientGenerator>
-    <table schema="aft" tableName="working_hours"
+    <table schema="aft" tableName="t_order_task"
 	enableCountByExample="false" enableUpdateByExample="false"
 	enableDeleteByExample="false" enableSelectByExample="false"
 	selectByExampleQueryId="false" enableSelectByPrimaryKey="true"

+ 58 - 0
src/main/java/com/goafanti/common/dao/ProjcetCheckLogMapper.java

@@ -0,0 +1,58 @@
+package com.goafanti.common.dao;
+
+import java.util.List;
+
+import com.goafanti.common.model.ProjcetCheckLog;
+import com.goafanti.order.bo.OutProjectCheckLog;
+
+public interface ProjcetCheckLogMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table projcet_check_log
+     *
+     * @mbg.generated Wed Jul 14 11:14:24 CST 2021
+     */
+    int deleteByPrimaryKey(Integer id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table projcet_check_log
+     *
+     * @mbg.generated Wed Jul 14 11:14:24 CST 2021
+     */
+    int insert(ProjcetCheckLog record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table projcet_check_log
+     *
+     * @mbg.generated Wed Jul 14 11:14:24 CST 2021
+     */
+    int insertSelective(ProjcetCheckLog record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table projcet_check_log
+     *
+     * @mbg.generated Wed Jul 14 11:14:24 CST 2021
+     */
+    ProjcetCheckLog selectByPrimaryKey(Integer id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table projcet_check_log
+     *
+     * @mbg.generated Wed Jul 14 11:14:24 CST 2021
+     */
+    int updateByPrimaryKeySelective(ProjcetCheckLog record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table projcet_check_log
+     *
+     * @mbg.generated Wed Jul 14 11:14:24 CST 2021
+     */
+    int updateByPrimaryKey(ProjcetCheckLog record);
+
+    List<OutProjectCheckLog> projectCheckLog(Integer tid);
+}

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

@@ -12,43 +12,43 @@ import org.apache.ibatis.annotations.Param;
 public interface TOrderTaskMapper {
     /**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Tue Jan 26 11:11:55 CST 2021
+	 * @mbg.generated  Wed Jul 14 15:27:49 CST 2021
 	 */
 	int deleteByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Tue Jan 26 11:11:55 CST 2021
+	 * @mbg.generated  Wed Jul 14 15:27:49 CST 2021
 	 */
 	int insert(TOrderTask record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Tue Jan 26 11:11:55 CST 2021
+	 * @mbg.generated  Wed Jul 14 15:27:49 CST 2021
 	 */
 	int insertSelective(TOrderTask record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Tue Jan 26 11:11:55 CST 2021
+	 * @mbg.generated  Wed Jul 14 15:27:49 CST 2021
 	 */
 	TOrderTask selectByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Tue Jan 26 11:11:55 CST 2021
+	 * @mbg.generated  Wed Jul 14 15:27:49 CST 2021
 	 */
 	int updateByPrimaryKeySelective(TOrderTask record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Tue Jan 26 11:11:55 CST 2021
+	 * @mbg.generated  Wed Jul 14 15:27:49 CST 2021
 	 */
 	int updateByPrimaryKeyWithBLOBs(TOrderTask record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Tue Jan 26 11:11:55 CST 2021
+	 * @mbg.generated  Wed Jul 14 15:27:49 CST 2021
 	 */
 	int updateByPrimaryKey(TOrderTask record);
 

+ 152 - 0
src/main/java/com/goafanti/common/mapper/ProjcetCheckLogMapper.xml

@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.goafanti.common.dao.ProjcetCheckLogMapper">
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.ProjcetCheckLog">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jul 14 11:14:24 CST 2021.
+    -->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="tid" jdbcType="INTEGER" property="tid" />
+    <result column="aid" jdbcType="VARCHAR" property="aid" />
+    <result column="remarks" jdbcType="VARCHAR" property="remarks" />
+    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jul 14 11:14:24 CST 2021.
+    -->
+    id, tid, aid, remarks, `status`, create_time
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jul 14 11:14:24 CST 2021.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from projcet_check_log
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jul 14 11:14:24 CST 2021.
+    -->
+    delete from projcet_check_log
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.ProjcetCheckLog">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jul 14 11:14:24 CST 2021.
+    -->
+    insert into projcet_check_log (id, tid, aid, 
+      remarks, `status`, create_time
+      )
+    values (#{id,jdbcType=INTEGER}, #{tid,jdbcType=INTEGER}, #{aid,jdbcType=VARCHAR}, 
+      #{remarks,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.ProjcetCheckLog">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jul 14 11:14:24 CST 2021.
+    -->
+    insert into projcet_check_log
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="tid != null">
+        tid,
+      </if>
+      <if test="aid != null">
+        aid,
+      </if>
+      <if test="remarks != null">
+        remarks,
+      </if>
+      <if test="status != null">
+        `status`,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="tid != null">
+        #{tid,jdbcType=INTEGER},
+      </if>
+      <if test="aid != null">
+        #{aid,jdbcType=VARCHAR},
+      </if>
+      <if test="remarks != null">
+        #{remarks,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        #{status,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.ProjcetCheckLog">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jul 14 11:14:24 CST 2021.
+    -->
+    update projcet_check_log
+    <set>
+      <if test="tid != null">
+        tid = #{tid,jdbcType=INTEGER},
+      </if>
+      <if test="aid != null">
+        aid = #{aid,jdbcType=VARCHAR},
+      </if>
+      <if test="remarks != null">
+        remarks = #{remarks,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        `status` = #{status,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.ProjcetCheckLog">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jul 14 11:14:24 CST 2021.
+    -->
+    update projcet_check_log
+    set tid = #{tid,jdbcType=INTEGER},
+      aid = #{aid,jdbcType=VARCHAR},
+      remarks = #{remarks,jdbcType=VARCHAR},
+      `status` = #{status,jdbcType=INTEGER},
+      create_time = #{createTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  
+    <select id="projectCheckLog" parameterType="java.lang.Integer" resultType="com.goafanti.order.bo.OutProjectCheckLog">
+    select a.id,a.tid,a.aid,a.remarks,a.status,b.name aname,date_format(a.create_time, '%Y-%m-%d %H:%i:%S')createTimes
+    from projcet_check_log a left join admin b on a.aid=b.id
+    where a.tid= #{tid}
+  </select>
+</mapper>

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

@@ -1579,7 +1579,7 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
   </select>
   
   <select id="getOrderNewDetail" parameterType="java.lang.String" resultType="com.goafanti.order.bo.TOrderNewBo">
-  	 select 
+  		 select 
     a.order_no as orderNo, a.order_type as orderType, a.creater, a.create_time as createTime,a.update_time as updateTime, a.buyer_id as buyerId,
     a.first_amount as firstAmount,a.total_amount as totalAmount, a.settlement_amount as settlementAmount, order_status as orderStatus,
     a.liquidation_status as liquidationStatus, a.process_status as processStatus, a.project_status as projectStatus, a.approval,
@@ -1587,7 +1587,7 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
     a.sign_time as signTime, a.settlement_time as settlementTime, a.contract_no as contractNo, a.contract_type as contractType, a.contacts,
     a.contact_mobile as contactMobile, a.legal_person as legalPerson, a.legal_person_tel as legalPersonTel, a.proof_count as proofCount,
     a.proof_aid as proofAid,contract_picture_url as contractPictureUrl, c.name as salesmanName,dep.name as depName,d.name as financeName,
-    c.contact_mobile as salesmanMobile,d.contact_mobile as financeMobile,b.username as userName ,e.back_status as backStatus,f.name as initiateName,
+    c.contact_mobile as salesmanMobile,d.contact_mobile as financeMobile,b.username as userName ,b.nickname as nickname ,e.back_status as backStatus,f.name as initiateName,
     e.reason,date_format(e.create_time,'%Y-%m-%d') as backDate,a.buyer_id as uid,a.order_dep as orderDep, g.location_province as locationProvince,
     g.location_city as locationCity,g.location_area locationArea,g.postal_address postalAddress,outsource,a.primary_order primaryOrder,a.agreement_url agreementUrl,
     h.name NowFinance,h.contact_mobile NowFinanceMobile,a.additional_order additionalOrder,i.name as oldSalesmanName, i.contact_mobile oldSalesmanMobile

+ 65 - 19
src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml

@@ -5,7 +5,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jan 26 11:11:55 CST 2021.
+      This element was generated on Wed Jul 14 15:27:49 CST 2021.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
@@ -61,12 +61,14 @@
     <result column="if_certification_fee" jdbcType="INTEGER" property="ifCertificationFee" />
     <result column="certification_fee" jdbcType="DECIMAL" property="certificationFee" />
     <result column="certification_corporate" jdbcType="VARCHAR" property="certificationCorporate" />
+    <result column="if_publicity" jdbcType="INTEGER" property="ifPublicity" />
+    <result column="check_status" jdbcType="INTEGER" property="checkStatus" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.goafanti.common.model.TOrderTask">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jan 26 11:11:55 CST 2021.
+      This element was generated on Wed Jul 14 15:27:49 CST 2021.
     -->
     <result column="attachment_url" jdbcType="LONGVARCHAR" property="attachmentUrl" />
     <result column="time_record" jdbcType="LONGVARCHAR" property="timeRecord" />
@@ -75,7 +77,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jan 26 11:11:55 CST 2021.
+      This element was generated on Wed Jul 14 15:27:49 CST 2021.
     -->
     id, order_no, main, super_id, commodity_id, commodity_name, commodity_quantity, commodity_mode, 
     commodity_price, task_status, task_distribution_time, task_allocator, task_receiver, 
@@ -85,13 +87,14 @@
     outsource_name, outsource_price, consultant_id, manager_id, outsource, split_super, 
     split_status, split_id, split_aid, split_time, cname, receiver_name, declaration_batch, 
     cost_reduction, official_cost, set_up_status, set_up_time, spot_check_status, high_tech_status, 
-    special_comment, if_certification_fee, certification_fee, certification_corporate
+    special_comment, if_certification_fee, certification_fee, certification_corporate, 
+    if_publicity, check_status
   </sql>
   <sql id="Blob_Column_List">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jan 26 11:11:55 CST 2021.
+      This element was generated on Wed Jul 14 15:27:49 CST 2021.
     -->
     attachment_url, time_record
   </sql>
@@ -99,7 +102,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jan 26 11:11:55 CST 2021.
+      This element was generated on Wed Jul 14 15:27:49 CST 2021.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -112,7 +115,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jan 26 11:11:55 CST 2021.
+      This element was generated on Wed Jul 14 15:27:49 CST 2021.
     -->
     delete from t_order_task
     where id = #{id,jdbcType=INTEGER}
@@ -121,7 +124,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jan 26 11:11:55 CST 2021.
+      This element was generated on Wed Jul 14 15:27:49 CST 2021.
     -->
     insert into t_order_task (id, order_no, main, 
       super_id, commodity_id, commodity_name, 
@@ -141,7 +144,8 @@
       official_cost, set_up_status, set_up_time, 
       spot_check_status, high_tech_status, special_comment, 
       if_certification_fee, certification_fee, certification_corporate, 
-      attachment_url, time_record)
+      if_publicity, check_status, attachment_url, 
+      time_record)
     values (#{id,jdbcType=INTEGER}, #{orderNo,jdbcType=VARCHAR}, #{main,jdbcType=INTEGER}, 
       #{superId,jdbcType=VARCHAR}, #{commodityId,jdbcType=VARCHAR}, #{commodityName,jdbcType=VARCHAR}, 
       #{commodityQuantity,jdbcType=INTEGER}, #{commodityMode,jdbcType=VARCHAR}, #{commodityPrice,jdbcType=DECIMAL}, 
@@ -160,13 +164,14 @@
       #{officialCost,jdbcType=INTEGER}, #{setUpStatus,jdbcType=INTEGER}, #{setUpTime,jdbcType=TIMESTAMP}, 
       #{spotCheckStatus,jdbcType=INTEGER}, #{highTechStatus,jdbcType=INTEGER}, #{specialComment,jdbcType=VARCHAR}, 
       #{ifCertificationFee,jdbcType=INTEGER}, #{certificationFee,jdbcType=DECIMAL}, #{certificationCorporate,jdbcType=VARCHAR}, 
-      #{attachmentUrl,jdbcType=LONGVARCHAR}, #{timeRecord,jdbcType=LONGVARCHAR})
+      #{ifPublicity,jdbcType=INTEGER}, #{checkStatus,jdbcType=INTEGER}, #{attachmentUrl,jdbcType=LONGVARCHAR}, 
+      #{timeRecord,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.TOrderTask">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jan 26 11:11:55 CST 2021.
+      This element was generated on Wed Jul 14 15:27:49 CST 2021.
     -->
     insert into t_order_task
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -332,6 +337,12 @@
       <if test="certificationCorporate != null">
         certification_corporate,
       </if>
+      <if test="ifPublicity != null">
+        if_publicity,
+      </if>
+      <if test="checkStatus != null">
+        check_status,
+      </if>
       <if test="attachmentUrl != null">
         attachment_url,
       </if>
@@ -502,6 +513,12 @@
       <if test="certificationCorporate != null">
         #{certificationCorporate,jdbcType=VARCHAR},
       </if>
+      <if test="ifPublicity != null">
+        #{ifPublicity,jdbcType=INTEGER},
+      </if>
+      <if test="checkStatus != null">
+        #{checkStatus,jdbcType=INTEGER},
+      </if>
       <if test="attachmentUrl != null">
         #{attachmentUrl,jdbcType=LONGVARCHAR},
       </if>
@@ -514,7 +531,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jan 26 11:11:55 CST 2021.
+      This element was generated on Wed Jul 14 15:27:49 CST 2021.
     -->
     update t_order_task
     <set>
@@ -677,6 +694,12 @@
       <if test="certificationCorporate != null">
         certification_corporate = #{certificationCorporate,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="attachmentUrl != null">
         attachment_url = #{attachmentUrl,jdbcType=LONGVARCHAR},
       </if>
@@ -690,7 +713,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jan 26 11:11:55 CST 2021.
+      This element was generated on Wed Jul 14 15:27:49 CST 2021.
     -->
     update t_order_task
     set order_no = #{orderNo,jdbcType=VARCHAR},
@@ -746,6 +769,8 @@
       if_certification_fee = #{ifCertificationFee,jdbcType=INTEGER},
       certification_fee = #{certificationFee,jdbcType=DECIMAL},
       certification_corporate = #{certificationCorporate,jdbcType=VARCHAR},
+      if_publicity = #{ifPublicity,jdbcType=INTEGER},
+      check_status = #{checkStatus,jdbcType=INTEGER},
       attachment_url = #{attachmentUrl,jdbcType=LONGVARCHAR},
       time_record = #{timeRecord,jdbcType=LONGVARCHAR}
     where id = #{id,jdbcType=INTEGER}
@@ -754,7 +779,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jan 26 11:11:55 CST 2021.
+      This element was generated on Wed Jul 14 15:27:49 CST 2021.
     -->
     update t_order_task
     set order_no = #{orderNo,jdbcType=VARCHAR},
@@ -809,14 +834,17 @@
       special_comment = #{specialComment,jdbcType=VARCHAR},
       if_certification_fee = #{ifCertificationFee,jdbcType=INTEGER},
       certification_fee = #{certificationFee,jdbcType=DECIMAL},
-      certification_corporate = #{certificationCorporate,jdbcType=VARCHAR}
+      certification_corporate = #{certificationCorporate,jdbcType=VARCHAR},
+      if_publicity = #{ifPublicity,jdbcType=INTEGER},
+      check_status = #{checkStatus,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
+  
   <!-- 记得返回id -->
-  <!-- &amp;amp;amp;amp;amp;amp;amp;lt;insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.TOrderTask" useGeneratedKeys="true"&amp;amp;amp;amp;amp;amp;amp;gt;
-  		&amp;amp;amp;amp;amp;amp;amp;lt;selectKey keyProperty="id" order="AFTER" resultType="int"&amp;amp;amp;amp;amp;amp;amp;gt;
+  <!-- &amp;amp;amp;amp;amp;amp;amp;amp;amp;amp;amp;amp;lt;insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.TOrderTask" useGeneratedKeys="true"&amp;amp;amp;amp;amp;amp;amp;amp;amp;amp;amp;amp;gt;
+  		&amp;amp;amp;amp;amp;amp;amp;amp;amp;amp;amp;amp;lt;selectKey keyProperty="id" order="AFTER" resultType="int"&amp;amp;amp;amp;amp;amp;amp;amp;amp;amp;amp;amp;gt;
         SELECT LAST_INSERT_ID()
-    &amp;amp;amp;amp;amp;amp;amp;lt;/selectKey&amp;amp;amp;amp;amp;amp;amp;gt; -->
+    &amp;amp;amp;amp;amp;amp;amp;amp;amp;amp;amp;amp;lt;/selectKey&amp;amp;amp;amp;amp;amp;amp;amp;amp;amp;amp;amp;gt; -->
   <insert id="insertSelectiveGetId" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.TOrderTask" useGeneratedKeys="true">
      insert into t_order_task
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -982,9 +1010,18 @@
       <if test="certificationCorporate != null">
         certification_corporate,
       </if>
+      <if test="ifPublicity != null">
+        if_publicity,
+      </if>
+      <if test="checkStatus != null">
+        check_status,
+      </if>
       <if test="attachmentUrl != null">
         attachment_url,
       </if>
+      <if test="timeRecord != null">
+        time_record,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -1149,9 +1186,18 @@
       <if test="certificationCorporate != null">
         #{certificationCorporate,jdbcType=VARCHAR},
       </if>
+      <if test="ifPublicity != null">
+        #{ifPublicity,jdbcType=INTEGER},
+      </if>
+      <if test="checkStatus != null">
+        #{checkStatus,jdbcType=INTEGER},
+      </if>
       <if test="attachmentUrl != null">
         #{attachmentUrl,jdbcType=LONGVARCHAR},
       </if>
+      <if test="timeRecord != null">
+        #{timeRecord,jdbcType=LONGVARCHAR},
+      </if>
     </trim>
     <selectKey keyProperty="id" order="AFTER" resultType="int">
         SELECT LAST_INSERT_ID()
@@ -1996,7 +2042,7 @@ left join department de on x.department_id=de.id left join business_category bc
   
    <resultMap id="userOrder" type="com.goafanti.common.bo.UserOrderTask">
     <id column="orderNo" jdbcType="VARCHAR" property="orderNo" />
-    <collection property="list" ofType="com.goafanti.common.bo.UserTask">
+    <collection ofType="com.goafanti.common.bo.UserTask" property="list">
     	<id column="id" jdbcType="VARCHAR" property="id" />
     	<result column="commodityName" jdbcType="VARCHAR" property="commodityName" />
     </collection>

+ 14 - 48
src/main/java/com/goafanti/common/mapper/UserMapperExt.xml

@@ -700,54 +700,20 @@
 	</select>
 	
 	<select id="findOrganizationCustomerDetail" parameterType="java.lang.String" resultType="com.goafanti.customer.bo.CustomerOrganizationDetailBo">
-		 select 
-			a.id as uid,
-			a.society_tag as societyTag,
-			a.company_logo_url as companyLogoUrl,
-			a.introduction,
-		    a.identify_name as identifyName,
-			b.industry,
-			b.location_province as locationProvince,
-			b.location_city as locationCity,
-			b.location_area as locationArea,
-			b.postal_address as postalAddress,
-			b.contacts_fixed_tel as contactsFixedTel,
-			b.contacts_fax as contactsFax,
-			b.registered_capital registeredCapital,
-			b.enterprise_scale as enterpriseScale,
-			b.legal_person as legalPerson,
-			b.legal_person_id_card as legalPersonIdCard,
-			b.legal_person_tel as legalPersonTel,
-			b.legal_person_email as legalPersonEmail,
-			b.org_code as orgCode,
-			b.org_code_url as orgCodeUrl,
-			b.business_scope as businessScope,
-			b.sales_target salesTarget,
-			b.id,
-			b.contacts,
-			b.contact_mobile as contactMobile,
-			b.licence_number as licenceNumber,
-			a.aid as aid,
-			d.name as adminName,
-			a.information_maintainer as informationMaintainer,
-			c.name as informationMaintainerName,
-			a.core_technology as coreTechnology,
-			a. accomplish_situation as  accomplishSituation,
-			a.intellectual_property as  intellectualProperty,
-			b.year_sales_amount as  yearSalesAmount,
-			b.last_year_research_amount as  lastYearResearchAmount,
-			b.assets,
-			b.qualification,
-			b.cooperation_situation as  cooperationSituation,
-			a.credit_rating as creditRating,
-			e.poject_application_url as pojectApplicationUrl
-		from 
-			user a inner join organization_identity b on a.id = b.uid
-			left join admin d on d.id = a.aid
-			left join admin c on c.id = a.information_maintainer
-			left join organization_application_info e on a.id=e.uid
-		where 
-			a.id = #{uid,jdbcType=VARCHAR}
+	select a.id as uid, a.society_tag as societyTag, a.company_logo_url as companyLogoUrl, a.introduction, a.identify_name as identifyName,
+	a.nickname, b.industry, b.location_province as locationProvince, b.location_city as locationCity, b.location_area as locationArea,
+	b.postal_address as postalAddress, b.contacts_fixed_tel as contactsFixedTel, b.contacts_fax as contactsFax, b.registered_capital registeredCapital,
+	b.enterprise_scale as enterpriseScale, b.legal_person as legalPerson, b.legal_person_id_card as legalPersonIdCard, b.legal_person_tel as legalPersonTel,
+	b.legal_person_email as legalPersonEmail, b.org_code as orgCode, b.org_code_url as orgCodeUrl, b.business_scope as businessScope,
+	b.sales_target salesTarget, b.id, b.contacts, b.contact_mobile as contactMobile, b.licence_number as licenceNumber, a.aid as aid,
+	d.name as adminName, a.information_maintainer as informationMaintainer, c.name as informationMaintainerName, a.core_technology as coreTechnology,
+	a. accomplish_situation as accomplishSituation, a.intellectual_property as intellectualProperty, b.year_sales_amount as yearSalesAmount,
+	b.last_year_research_amount as lastYearResearchAmount, b.assets, b.qualification, b.cooperation_situation as cooperationSituation,
+	a.credit_rating as creditRating, e.poject_application_url as pojectApplicationUrl
+	from user a inner join organization_identity b on a.id = b.uid 
+	left join admin d on d.id = a.aid left join admin c on c.id = a.information_maintainer
+	left join organization_application_info e on a.id=e.uid where
+	a.id = #{uid,jdbcType=VARCHAR}
 	</select>
 	
 	<select id="findPersonalCustomerDetail" parameterType="java.lang.String" resultType="com.goafanti.customer.bo.CustomerPersonalDetailBo">

+ 235 - 0
src/main/java/com/goafanti/common/model/ProjcetCheckLog.java

@@ -0,0 +1,235 @@
+package com.goafanti.common.model;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class ProjcetCheckLog implements Serializable {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column projcet_check_log.id
+     *
+     * @mbg.generated Wed Jul 14 11:14:24 CST 2021
+     */
+    private Integer id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column projcet_check_log.tid
+     *
+     * @mbg.generated Wed Jul 14 11:14:24 CST 2021
+     */
+    private Integer tid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column projcet_check_log.aid
+     *
+     * @mbg.generated Wed Jul 14 11:14:24 CST 2021
+     */
+    private String aid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column projcet_check_log.remarks
+     *
+     * @mbg.generated Wed Jul 14 11:14:24 CST 2021
+     */
+    private String remarks;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column projcet_check_log.status
+     *
+     * @mbg.generated Wed Jul 14 11:14:24 CST 2021
+     */
+    private Integer status;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column projcet_check_log.create_time
+     *
+     * @mbg.generated Wed Jul 14 11:14:24 CST 2021
+     */
+    private Date createTime;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table projcet_check_log
+     *
+     * @mbg.generated Wed Jul 14 11:14:24 CST 2021
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column projcet_check_log.id
+     *
+     * @return the value of projcet_check_log.id
+     *
+     * @mbg.generated Wed Jul 14 11:14:24 CST 2021
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column projcet_check_log.id
+     *
+     * @param id the value for projcet_check_log.id
+     *
+     * @mbg.generated Wed Jul 14 11:14:24 CST 2021
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column projcet_check_log.tid
+     *
+     * @return the value of projcet_check_log.tid
+     *
+     * @mbg.generated Wed Jul 14 11:14:24 CST 2021
+     */
+    public Integer getTid() {
+        return tid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column projcet_check_log.tid
+     *
+     * @param tid the value for projcet_check_log.tid
+     *
+     * @mbg.generated Wed Jul 14 11:14:24 CST 2021
+     */
+    public void setTid(Integer tid) {
+        this.tid = tid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column projcet_check_log.aid
+     *
+     * @return the value of projcet_check_log.aid
+     *
+     * @mbg.generated Wed Jul 14 11:14:24 CST 2021
+     */
+    public String getAid() {
+        return aid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column projcet_check_log.aid
+     *
+     * @param aid the value for projcet_check_log.aid
+     *
+     * @mbg.generated Wed Jul 14 11:14:24 CST 2021
+     */
+    public void setAid(String aid) {
+        this.aid = aid == null ? null : aid.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column projcet_check_log.remarks
+     *
+     * @return the value of projcet_check_log.remarks
+     *
+     * @mbg.generated Wed Jul 14 11:14:24 CST 2021
+     */
+    public String getRemarks() {
+        return remarks;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column projcet_check_log.remarks
+     *
+     * @param remarks the value for projcet_check_log.remarks
+     *
+     * @mbg.generated Wed Jul 14 11:14:24 CST 2021
+     */
+    public void setRemarks(String remarks) {
+        this.remarks = remarks == null ? null : remarks.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column projcet_check_log.status
+     *
+     * @return the value of projcet_check_log.status
+     *
+     * @mbg.generated Wed Jul 14 11:14:24 CST 2021
+     */
+    public Integer getStatus() {
+        return status;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column projcet_check_log.status
+     *
+     * @param status the value for projcet_check_log.status
+     *
+     * @mbg.generated Wed Jul 14 11:14:24 CST 2021
+     */
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column projcet_check_log.create_time
+     *
+     * @return the value of projcet_check_log.create_time
+     *
+     * @mbg.generated Wed Jul 14 11:14:24 CST 2021
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column projcet_check_log.create_time
+     *
+     * @param createTime the value for projcet_check_log.create_time
+     *
+     * @mbg.generated Wed Jul 14 11:14:24 CST 2021
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table projcet_check_log
+     *
+     * @mbg.generated Wed Jul 14 11:14:24 CST 2021
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", tid=").append(tid);
+        sb.append(", aid=").append(aid);
+        sb.append(", remarks=").append(remarks);
+        sb.append(", status=").append(status);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

File diff suppressed because it is too large
+ 286 - 246
src/main/java/com/goafanti/common/model/TOrderTask.java


+ 7 - 0
src/main/java/com/goafanti/customer/bo/CustomerOrganizationDetailBo.java

@@ -9,6 +9,7 @@ public class CustomerOrganizationDetailBo extends OrganizationIdentity{
 	private static final long serialVersionUID = 1L;
 	
 	private String identifyName;
+	private String nickname;
 	private String societyTag;
 	private String companyLogoUrl;
 	private String introduction;
@@ -110,5 +111,11 @@ public class CustomerOrganizationDetailBo extends OrganizationIdentity{
 	public void setPojectApplicationUrl(String pojectApplicationUrl) {
 		this.pojectApplicationUrl = pojectApplicationUrl;
 	}
+	public String getNickname() {
+		return nickname;
+	}
+	public void setNickname(String nickname) {
+		this.nickname = nickname;
+	}
 	
 }

+ 42 - 0
src/main/java/com/goafanti/order/bo/OutProjectCheckLog.java

@@ -0,0 +1,42 @@
+package com.goafanti.order.bo;
+
+import com.goafanti.common.model.ProjcetCheckLog;
+
+public class OutProjectCheckLog extends ProjcetCheckLog{
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+	
+	private String aname;
+	private String createTimes;
+
+	public String getAname() {
+		return aname;
+	}
+
+	public void setAname(String aname) {
+		this.aname = aname;
+	}
+
+	public String getCreateTimes() {
+		return createTimes;
+	}
+
+	public void setCreateTimes(String createTimes) {
+		this.createTimes = createTimes;
+	}
+
+	public String getStatusName() {
+		if (getStatus()==0) {
+			return "发起";
+		}else if(getStatus()==1) {
+			return "修改";
+		}
+		return "未知";
+	}
+
+	
+
+}

+ 7 - 0
src/main/java/com/goafanti/order/bo/TOrderNewBo.java

@@ -15,6 +15,7 @@ public class TOrderNewBo extends TOrderNew{
 	private String id;
 	private String signDate;
 	private String userName;
+	private String nickname;
 	private String salesmanName;
 	private String financeName;
 	private String consultantName;
@@ -361,5 +362,11 @@ public class TOrderNewBo extends TOrderNew{
 	public void setTaskList(List<?> taskList) {
 		this.taskList = taskList;
 	}
+	public String getNickname() {
+		return nickname;
+	}
+	public void setNickname(String nickname) {
+		this.nickname = nickname;
+	}
 	
 }

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

@@ -95,6 +95,11 @@ public class AdminNewOrderApiController extends CertifyApiController {
 		}
 		return res.data(orderNewService.updateOrderTask(t));
 	}
+	
+	
+
+	
+	
 	/**
 	 * 删除订单项目
 	 * @param detailId
@@ -535,4 +540,6 @@ public class AdminNewOrderApiController extends CertifyApiController {
 		 return  excel.exportExcel(list,"欠款催款列表",response);
 	}
 	
+	
+	
 }

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

@@ -379,4 +379,38 @@ public class OrderProjectApiController extends CertifyApiController {
 		res.data( orderProjectService.selectUidByproject(uid) );
 		return res;
 	}
+	
+	/**
+	 * 	发起项目核对
+	 * @param tid
+	 * @return
+	 */
+	@RequestMapping(value = "/addProjectCheck",method = RequestMethod.POST)
+	public Result addProjectCheck(Integer tid) {
+		Result res =new Result();
+		if (tid==null) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR,"项目编号","项目编号"));
+			return res;
+		}
+		res.data( orderProjectService.addProjectCheck(tid) );
+		return res;
+	}
+	
+	/**
+	 * 	核对日志
+	 * @param tid
+	 * @return
+	 */
+	@RequestMapping(value = "/projectCheckLog",method = RequestMethod.GET)
+	public Result projectCheckLog(Integer tid) {
+		Result res =new Result();
+		if (tid==null) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR,"项目编号","项目编号"));
+			return res;
+		}
+		res.data( orderProjectService.projectCheckLog(tid) );
+		return res;
+	}
+	
+	
 }

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

@@ -43,6 +43,7 @@ public interface OrderNewService {
 	/**
 	 * 修改项目信息
 	 * @param t
+	 * @param change 
 	 * @return
 	 */
 	int updateOrderTask(TOrderTask t);

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

@@ -79,5 +79,9 @@ public interface OrderProjectService {
 
 	List<UserOrderTask> selectUidByproject(String uid);
 
+	int addProjectCheck(Integer tid);
+
+	Object projectCheckLog(Integer tid);
+
 
 }

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

@@ -44,6 +44,7 @@ import com.goafanti.common.dao.OrganizationContactBookMapper;
 import com.goafanti.common.dao.OrganizationManagementMapper;
 import com.goafanti.common.dao.OutsourceLogMapper;
 import com.goafanti.common.dao.PaymentNodeMapper;
+import com.goafanti.common.dao.ProjcetCheckLogMapper;
 import com.goafanti.common.dao.TArrearsDunMapper;
 import com.goafanti.common.dao.TDunLogMapper;
 import com.goafanti.common.dao.TOrderBackMapper;
@@ -71,6 +72,7 @@ import com.goafanti.common.model.OrganizationContactBook;
 import com.goafanti.common.model.OrganizationManagement;
 import com.goafanti.common.model.OutsourceLog;
 import com.goafanti.common.model.PaymentNode;
+import com.goafanti.common.model.ProjcetCheckLog;
 import com.goafanti.common.model.TArrearsDun;
 import com.goafanti.common.model.TDunLog;
 import com.goafanti.common.model.TOrderBack;
@@ -176,6 +178,8 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	@Autowired
 	private UserMidMapper	userMidMapper;
 	@Autowired
+	private ProjcetCheckLogMapper	projcetCheckLogMapper;
+	@Autowired
 	private AsyncUtils	asyncUtils;
 	
 	@Value(value = "${mobileRemindCodeTemplate}")
@@ -261,6 +265,29 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 	@Override
 	public int updateOrderTask(TOrderTask t) {
+		TOrderTask use=tOrderTaskMapper.selectByPrimaryKey(t.getId());
+		if(use.getCheckStatus()==1) {
+			t.setCheckStatus(2);
+			ProjcetCheckLog log=new ProjcetCheckLog();
+			log.setTid(t.getId());
+			log.setAid(TokenManager.getAdminId());
+			StringBuffer str=new StringBuffer();
+			if (t.getOfficialCost()==null&&t.getCostReduction()==null) {
+				str.append("未做修改");
+			}else {
+				str.append("修改了:");
+				if (t.getOfficialCost()!=null&&use.getOfficialCost()!=t.getOfficialCost()) {
+					str.append("官费");
+				}
+				if (t.getCostReduction()!=null&&use.getCostReduction()!=t.getCostReduction()) {
+					str.append(",").append("费减");
+				}
+					str.append("。");
+			}
+			log.setRemarks(str.toString());
+			log.setStatus(1);
+			projcetCheckLogMapper.insertSelective(log);
+		}
 		return tOrderTaskMapper.updateByPrimaryKeySelective(t);
 	}
 

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

@@ -33,6 +33,7 @@ import com.goafanti.common.dao.NewOrderDunMapper;
 import com.goafanti.common.dao.OrganizationContactBookMapper;
 import com.goafanti.common.dao.OrganizationIdentityMapper;
 import com.goafanti.common.dao.PaymentNodeMapper;
+import com.goafanti.common.dao.ProjcetCheckLogMapper;
 import com.goafanti.common.dao.TArrearsDunMapper;
 import com.goafanti.common.dao.TOrderBonusMapper;
 import com.goafanti.common.dao.TOrderLogMapper;
@@ -60,6 +61,7 @@ import com.goafanti.common.model.BusinessProject;
 import com.goafanti.common.model.Notice;
 import com.goafanti.common.model.OrganizationContactBook;
 import com.goafanti.common.model.OrganizationIdentity;
+import com.goafanti.common.model.ProjcetCheckLog;
 import com.goafanti.common.model.TArrearsDun;
 import com.goafanti.common.model.TOrderBonus;
 import com.goafanti.common.model.TOrderLog;
@@ -85,6 +87,7 @@ import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.order.bo.OutNewOrderDunBo;
+import com.goafanti.order.bo.OutProjectCheckLog;
 import com.goafanti.order.bo.OutTaskProgressLog;
 import com.goafanti.order.bo.TOrderTaskBo;
 import com.goafanti.order.bo.TOrderTaskDetailBo;
@@ -159,6 +162,8 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 	@Autowired
 	private TaskAttributionLogMapper	taskAttributionLogMapper;
 	@Autowired
+	private ProjcetCheckLogMapper	projcetCheckLogMapper;
+	@Autowired
 	private AsyncUtils	asyncUtils;
 	@Value(value = "${upload.path}")
 	private String 					uploadPath 			= null;
@@ -987,5 +992,26 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		
 		return tOrderTaskMapper.selectUidByproject(uid);
 	}
+
+
+	@Override
+	public int addProjectCheck(Integer tid) {
+		TOrderTask t=new TOrderTask();
+		t.setCheckStatus(1);
+		t.setId(tid);
+		ProjcetCheckLog log=new ProjcetCheckLog();
+		log.setAid(TokenManager.getAdminId());
+		log.setRemarks("发起核对");
+		log.setTid(tid);
+		log.setStatus(0);
+		projcetCheckLogMapper.insertSelective(log);
+		return tOrderTaskMapper.updateByPrimaryKeySelective(t);
+	}
+
+
+	@Override
+	public List<OutProjectCheckLog> projectCheckLog(Integer tid) {
+		return projcetCheckLogMapper.projectCheckLog(tid);
+	}
 	
 }

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

@@ -5,7 +5,7 @@ jdbc.driverClassName=com.mysql.jdbc.Driver
 jdbc.url=jdbc\:mysql://localhost:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
 jdbc.username=root
 jdbc.password=123456
-#测试
+•#
 #jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
 #jdbc.username=root
 #jdbc.password=aftdev