anderx лет назад: 4
Родитель
Сommit
6393b446ca

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

@@ -44,4 +44,6 @@ public interface TOrderNewMapper {
     List<outStatisticsList> statisticsList(InputStatistics in);
 
     List<outProvinceStatisticsList> provinceStatisticsList(InputStatistics in);
+
+    List<Map<String, Object>> selectOrderByuid(String uid);
 }

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

@@ -30,12 +30,13 @@
     <result column="plan" jdbcType="VARCHAR" property="plan" />
     <result column="expected_effect" jdbcType="VARCHAR" property="expectedEffect" />
     <result column="next_plan" jdbcType="VARCHAR" property="nextPlan" />
+    <result column="type" jdbcType="INTEGER" property="type" />
   </resultMap>
   <sql id="Base_Column_List">
     id, `uid`, aid, release_start, release_end, remarks, annex_url, user_name, longitude, 
     latitude, `status`, create_time, clock_in, clock_in_time, photo_url, pid, pname, 
     ufid, duration, valid_date, new_user, sign_sum, main_status, supplement, audit_info, 
-    `plan`, expected_effect, next_plan
+    `plan`, expected_effect, next_plan, `type`
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
@@ -56,8 +57,8 @@
       pname, ufid, duration, 
       valid_date, new_user, sign_sum, 
       main_status, supplement, audit_info, 
-      `plan`, expected_effect, next_plan
-      )
+      `plan`, expected_effect, next_plan, 
+      `type`)
     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}, 
@@ -66,8 +67,8 @@
       #{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}
-      )
+      #{plan,jdbcType=VARCHAR}, #{expectedEffect,jdbcType=VARCHAR}, #{nextPlan,jdbcType=VARCHAR}, 
+      #{type,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.PublicRelease" useGeneratedKeys="true">
     insert into public_release
@@ -153,6 +154,9 @@
       <if test="nextPlan != null">
         next_plan,
       </if>
+      <if test="type != null">
+        `type`,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="uid != null">
@@ -236,6 +240,9 @@
       <if test="nextPlan != null">
         #{nextPlan,jdbcType=VARCHAR},
       </if>
+      <if test="type != null">
+        #{type,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.PublicRelease">
@@ -322,6 +329,9 @@
       <if test="nextPlan != null">
         next_plan = #{nextPlan,jdbcType=VARCHAR},
       </if>
+      <if test="type != null">
+        `type` = #{type,jdbcType=INTEGER},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -353,7 +363,8 @@
       audit_info = #{auditInfo,jdbcType=VARCHAR},
       `plan` = #{plan,jdbcType=VARCHAR},
       expected_effect = #{expectedEffect,jdbcType=VARCHAR},
-      next_plan = #{nextPlan,jdbcType=VARCHAR}
+      next_plan = #{nextPlan,jdbcType=VARCHAR},
+      `type` = #{type,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
 

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

@@ -1536,4 +1536,8 @@ select a.id, b.contract_no contractNo,a.order_no as orderNo,c.nickname as userNa
     </if>
      desc
   </select>
+    <select id="selectOrderByuid" resultType="java.util.Map">
+      select order_no orderNo,contract_no contractNo
+      from t_order_new  where delete_sign in (0,2) and  buyer_id = #{uid}
+    </select>
 </mapper>

+ 13 - 0
src/main/java/com/goafanti/common/model/PublicRelease.java

@@ -145,6 +145,11 @@ public class PublicRelease implements Serializable {
      */
     private String nextPlan;
 
+    /**
+     * 分类 0业务/行政 1技术
+     */
+    private Integer type;
+
     private static final long serialVersionUID = 1L;
 
     public Integer getId() {
@@ -370,4 +375,12 @@ public class PublicRelease implements Serializable {
     public void setNextPlan(String nextPlan) {
         this.nextPlan = nextPlan;
     }
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
 }

+ 14 - 1
src/main/java/com/goafanti/weChat/controller/AdminReleaseApiController.java

@@ -231,7 +231,20 @@ public class AdminReleaseApiController extends CertifyApiController{
 		res.setData(publicReleaseService.addSupplement( id ,supplement,nextPlan));
 		return res;
 	}
-	
+
+	/**
+	 * 根据客户返回订单
+	 */
+	@RequestMapping(value = "/selectOrderByuid",method =RequestMethod.GET)
+	public Result selectOrderByuid(String uid){
+		Result res = new Result();
+		if (uid==null){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,ErrorConstants.PARAM_EMPTY_ERROR,"客户编号"));
+			return res;
+		}
+		res.data(publicReleaseService.selectOrderByuid(uid));
+		return res;
+	}
 	
 	
 }

+ 2 - 0
src/main/java/com/goafanti/weChat/service/PublicReleaseService.java

@@ -43,4 +43,6 @@ public interface PublicReleaseService {
 	List<OutPublicDtails> publicReleaseListDtailsList(InputPublicDtails in);
 
     int addSupplement(Integer id, String supplement, String nextPlan);
+
+    List<Map<String,Object>> selectOrderByuid(String uid);
 }

+ 9 - 6
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -8,6 +8,7 @@ import java.util.Map;
 import java.util.UUID;
 
 
+import com.goafanti.common.dao.*;
 import com.goafanti.order.service.OrderService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -16,11 +17,6 @@ import org.springframework.web.socket.TextMessage;
 import com.goafanti.admin.bo.AdminListBo;
 import com.goafanti.common.bo.EmailBo;
 import com.goafanti.common.constant.AFTConstants;
-import com.goafanti.common.dao.AdminMapper;
-import com.goafanti.common.dao.OrganizationContactBookMapper;
-import com.goafanti.common.dao.PublicReleaseLogMapper;
-import com.goafanti.common.dao.PublicReleaseMapper;
-import com.goafanti.common.dao.UserMapper;
 import com.goafanti.common.enums.NoticeStatus;
 import com.goafanti.common.error.BusinessException;
 import com.goafanti.common.model.Admin;
@@ -74,6 +70,8 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 	private OrganizationContactBookMapper	organizationContactBookMapper;
 	@Autowired
 	private SystemWebSocketHandler	systemWebSocketHandler;
+	@Autowired
+	private TOrderNewMapper tOrderNewMapper;
 	
 	@Override
 	public Map<String, Object> addPublicRelease(InputPublicRelease in) {
@@ -374,6 +372,8 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 	}
 
 
+
+
 	@Override
 	public boolean checkTime(InputPublicRelease in) {
 		try {
@@ -391,7 +391,10 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 	}
 
 
-
+	@Override
+	public List<Map<String, Object>> selectOrderByuid(String uid) {
+		return tOrderNewMapper.selectOrderByuid(uid);
+	}
 
 
 

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

@@ -50,7 +50,7 @@ avatar.upload.host=//sb.jishutao.com/upload
 #avatar.host=//172.16.0.253
 
 avatar.host=//static.jishutao.com
-static.host=//static.jishutao.com/1.1.99
+static.host=//static.jishutao.com/1.2.01
 
 wx.appId=wxff2f5720ed7d7f63
 wx.appSecret=081744369d42405be58fe37f892631f7

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

@@ -43,7 +43,7 @@ user_remind_days=15
 #提前提醒天数
 user_channel_days=90
 
-static.host=//static.jishutao.com/1.1.99
+static.host=//static.jishutao.com/1.2.01
 portal.host=//static.jishutao.com/portal/2.0.6
 avatar.host=//static.jishutao.com
 avatar.upload.host=//static.jishutao.com/upload