Browse Source

订单项目状态修改接口修改

anderx 4 years ago
parent
commit
75b7990a67

+ 23 - 0
.idea/free-mybatis-generator-config.xml

@@ -189,6 +189,29 @@
             </Config>
           </value>
         </entry>
+        <entry key="t_order_task">
+          <value>
+            <Config>
+              <option name="comment" value="true" />
+              <option name="daoMvnPath" value="src/main/java" />
+              <option name="daoName" value="TOrderTaskMapper" />
+              <option name="daoPackage" value="com.goafanti.common.dao" />
+              <option name="daoPostfix" value="Mapper" />
+              <option name="modelMvnPath" value="src/main/java" />
+              <option name="modelName" value="TOrderTask" />
+              <option name="modelPackage" value="com.goafanti.common.model" />
+              <option name="name" value="t_order_task" />
+              <option name="needToStringHashcodeEquals" value="true" />
+              <option name="overrideJava" value="true" />
+              <option name="overrideXML" value="true" />
+              <option name="primaryKey" value="id" />
+              <option name="projectFolder" value="$PROJECT_DIR$" />
+              <option name="tableName" value="t_order_task" />
+              <option name="xmlMvnPath" value="src/main/java" />
+              <option name="xmlPackage" value="com.goafanti.common.mapper" />
+            </Config>
+          </value>
+        </entry>
         <entry key="t_task_mid">
           <value>
             <Config>

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

@@ -11,88 +11,58 @@ import java.util.List;
 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  Fri Jul 16 15:11:11 CST 2021
-	 */
-	int deleteByPrimaryKey(Integer id);
+    int deleteByPrimaryKey(Integer id);
 
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Fri Jul 16 15:11:11 CST 2021
-	 */
-	int insert(TOrderTask record);
+    int insert(TOrderTask record);
 
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Fri Jul 16 15:11:11 CST 2021
-	 */
-	int insertSelective(TOrderTask record);
+    int insertSelective(TOrderTask record);
 
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Fri Jul 16 15:11:11 CST 2021
-	 */
-	TOrderTask selectByPrimaryKey(Integer id);
+    TOrderTask selectByPrimaryKey(Integer id);
 
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Fri Jul 16 15:11:11 CST 2021
-	 */
-	int updateByPrimaryKeySelective(TOrderTask record);
+    int updateByPrimaryKeySelective(TOrderTask record);
 
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Fri Jul 16 15:11:11 CST 2021
-	 */
-	int updateByPrimaryKeyWithBLOBs(TOrderTask record);
+    int updateByPrimaryKey(TOrderTask record);
 
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Fri Jul 16 15:11:11 CST 2021
-	 */
-	int updateByPrimaryKey(TOrderTask record);
+    List<TOrderTaskBo> selectOrderTask(String orderNo);
 
-	List<TOrderTaskBo> selectOrderTask(String orderNo);
+    TOrderTaskDetailBo getOrderTaskDetail(String id);
 
-	TOrderTaskDetailBo getOrderTaskDetail(String id);
+    TOrderTask selectBySuperId(String superId);
 
-	TOrderTask selectBySuperId(String superId);
-	
-	List<TOrderTask> getReceiverByOid(String oid);
+    List<TOrderTask> getReceiverByOid(String oid);
 
-	void updateDimissionTransfer(@Param("aid")String aid, @Param("transferId")String transferId, @Param("type")Integer type);
+    void updateDimissionTransfer(@Param("aid")String aid, @Param("transferId")String transferId, @Param("type")Integer type);
 
-	String selectEstimateCost(String orderNo);
+    String selectEstimateCost(String orderNo);
 
-	List<String> listNameByDepAndName(@Param("orderNo")String orderNo, @Param("type")Integer type);
+    List<String> listNameByDepAndName(@Param("orderNo")String orderNo, @Param("type")Integer type);
 
-	List<TOrderTaskListBo> splitProjectList(Integer tid);
+    List<TOrderTaskListBo> splitProjectList(Integer tid);
 
-	List<TOrderTaskBo> selectOrderTaskAll(String orderNo);
+    List<TOrderTaskBo> selectOrderTaskAll(String orderNo);
 
-	String selectByidGetCname(String pid);
+    String selectByidGetCname(String pid);
 
-	void updateByOutsourceToOrderNo(@Param("orderNo")String orderNo, @Param("type")Integer type);
+    void updateByOutsourceToOrderNo(@Param("orderNo")String orderNo, @Param("type")Integer type);
 
-	int insertSelectiveGetId(TOrderTask tn);
+    int insertSelectiveGetId(TOrderTask tn);
 
-	List<String> getLockId(@Param("orderNo")String orderNo, @Param("aid")String aid, @Param("uid")String uid);
+    List<String> getLockId(@Param("orderNo")String orderNo, @Param("aid")String aid, @Param("uid")String uid);
 
-	List<UserOrderTask> selectUidByproject(String uid);
+    List<UserOrderTask> selectUidByproject(String uid);
 
-	void resstPayment(Integer id);
+    void resstPayment(Integer id);
 
-	void updateAddCostAmount(@Param("tid")Integer tid, @Param("cost")BigDecimal cost);
+    void updateAddCostAmount(@Param("tid")Integer tid, @Param("cost")BigDecimal cost);
 
-	OrderOperator selectAidByParam(@Param("tid")Integer tid);
+    OrderOperator selectAidByParam(@Param("tid")Integer tid);
 
-	ProjectTypePuls selectByTidGetDtails(Integer tid);
+    ProjectTypePuls selectByTidGetDtails(Integer tid);
 
     List<OutHighNewRetrialStatistics> highNewRetrialStatistics(@Param("depId") String depId, @Param("startDate") String startDate, @Param("endDate") String endDate);
 
     int getHighNewRetrial(String orderNo);
 
-	List<OutHighNewRetrialList> highNewRetrialList(@Param("province") String province, @Param("depId") String depId, @Param("aid") String aid,
-												   @Param("sort") Integer sort, @Param("startDate") String startDate, @Param("endDate") String endDate);
+    List<OutHighNewRetrialList> highNewRetrialList(@Param("province") String province, @Param("depId") String depId, @Param("aid") String aid,
+                                                   @Param("sort") Integer sort, @Param("startDate") String startDate, @Param("endDate") String endDate);
 }

File diff suppressed because it is too large
+ 851 - 971
src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml


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


+ 14 - 0
src/main/java/com/goafanti/order/bo/UpdateProjectStatusBo.java

@@ -17,6 +17,20 @@ public class UpdateProjectStatusBo {
 	
 	private String setUpAmount;
 
+	private String pubicityUrl;
+
+	public String getPubicityUrl() {
+		return pubicityUrl;
+	}
+
+	public void setPubicityUrl(String pubicityUrl) {
+		this.pubicityUrl = pubicityUrl;
+	}
+
+	public UpdateProjectStatusBo(String pubicityUrl) {
+		this.pubicityUrl = pubicityUrl;
+	}
+
 	public Integer getTid() {
 		return tid;
 	}

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

@@ -449,7 +449,8 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		t.setProjectStatus(b.getProjectStatus());
 		t.setTimeRecord(b.getTimeRecord());
 		t.setCertificateNumber(b.getCertificateNumber());
-		t.setSetUpAmount(b.getSetUpAmount());
+		t.setSetUpAmount(new BigDecimal(b.getSetUpAmount()));
+		if (b.getPubicityUrl()!=null)t.setPubicityUrl(b.getPubicityUrl());
 		TOrderTask task2=tOrderTaskMapper.selectByPrimaryKey(b.getTid());//查询出项目信息
 		if(b.getProjectStatus()!=task2.getProjectStatus()){
 			if(b.getProjectStatus()==NewProjectStatus.YLX.getCode()) t.setSetUpStatus(1);