Просмотр исходного кода

Merge branch 'test'

# Conflicts:
#	src/main/resources/props/config_test.properties
anderx лет назад: 3
Родитель
Сommit
747beaf4d8

+ 25 - 0
src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml

@@ -1029,6 +1029,10 @@
     <if test="name != null">
       and f.nickname like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
     </if>
+      <if test="thchId != null">
+      and a.task_receiver = #{thchId,jdbcType=VARCHAR}
+    </if>
+
     <if test="cid != null">
       and b.cid = #{cid,jdbcType=VARCHAR}
     </if>
@@ -1069,6 +1073,9 @@
     <if test="name != null">
       and f.nickname like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
     </if>
+    <if test="thchId != null">
+      and a.task_receiver = #{thchId,jdbcType=VARCHAR}
+    </if>
     <if test="outsource != null">
       and a.outsource = #{outsource,jdbcType=INTEGER}
     </if>
@@ -1116,6 +1123,9 @@
     <if test="depId != null">
       and e.order_dep= #{depId ,jdbcType=VARCHAR}
     </if>
+    <if test="thchId != null">
+      and a.task_receiver = #{thchId,jdbcType=VARCHAR}
+    </if>
     <if test="taskId != null">
       and (a.id= #{taskId,jdbcType=VARCHAR} or a.split_super= #{taskId,jdbcType=VARCHAR})
     </if>
@@ -1152,6 +1162,9 @@
     <if test="depId != null">
       and e.order_dep= #{depId ,jdbcType=VARCHAR}
     </if>
+    <if test="thchId != null">
+      and a.task_receiver = #{thchId,jdbcType=VARCHAR}
+    </if>
     <if test="orderNo != null">
       and a.order_no= #{orderNo,jdbcType=VARCHAR}
     </if>
@@ -1338,6 +1351,9 @@
     <if test="userName !=null">
       and e.buyer_name like concat('%', #{userName},'%')
     </if>
+    <if test="thchId !=null">
+      and a.task_receiver = #{thchId}
+    </if>
     <if test="declarationBatch !=null">
       and a.declaration_batch = #{declarationBatch}
     </if>
@@ -1449,6 +1465,9 @@
     <if test="userName !=null">
       and e.buyer_name like concat('%', #{userName},'%')
     </if>
+    <if test="thchId !=null">
+      and a.task_receiver = #{thchId}
+    </if>
     <if test="declarationBatch !=null">
       and a.declaration_batch = #{declarationBatch}
     </if>
@@ -1568,6 +1587,9 @@
     <if test="name !=null">
       and tm.buyer_name like CONCAT('%',#{name},'%')
     </if>
+    <if test="thchId !=null">
+      and a.task_receiver = #{thchId}
+    </if>
     <if test="cid !=null">
       and bp.cid =#{cid}
     </if>
@@ -1611,6 +1633,9 @@
     <if test="name !=null">
       and tm.buyer_name like CONCAT('%',#{name},'%')
     </if>
+    <if test="thchId !=null">
+      and a.task_receiver = #{thchId}
+    </if>
     <if test="cid !=null">
       and bp.cid =#{cid}
     </if>

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

@@ -595,6 +595,9 @@ where x.id=  #{tid}
 		<if test="status !=null">
 		and a.status= #{status}
 		</if>
+     <if test="thchId != null">
+       and b.task_receiver = #{thchId,jdbcType=VARCHAR}
+     </if>
 		order by a.status,a.create_time desc
 		<if test="lvl==4">
 		,a.process_status
@@ -651,6 +654,9 @@ where x.id=  #{tid}
 		<if test="status !=null">
 		and a.status= #{status}
 		</if>
+     <if test="thchId != null">
+       and b.task_receiver = #{thchId,jdbcType=VARCHAR}
+     </if>
   </select>
  <select id="selectNodeList" resultType="com.goafanti.organization.bo.outNodeList">
 	  select c.contract_no contractNo,c.order_no orderNo,d.buyer_name userName,

+ 1 - 0
src/main/java/com/goafanti/common/utils/excel/NewExcelUtil.java

@@ -345,6 +345,7 @@ public class NewExcelUtil<T> {
 			// 得到导出对象.
 			T vo = (T) list.get(i);
 			int column = 0;
+			System.out.println(i);
 			for (Object[] os : fields) {
 				Field field = (Field) os[0];
 				Excel excel = (Excel) os[1];

+ 10 - 0
src/main/java/com/goafanti/order/bo/InputProjectStatistics.java

@@ -21,6 +21,7 @@ public class InputProjectStatistics {
 	private Integer status;
 	private String depName;
 	private String thchDepName;
+	private String thchId;
 	private String projectStatusName;
 	private String projectTypeName;
 
@@ -32,6 +33,15 @@ public class InputProjectStatistics {
 	 */
 	private Integer screen;
 
+
+	public String getThchId() {
+		return thchId;
+	}
+
+	public void setThchId(String thchId) {
+		this.thchId = thchId;
+	}
+
 	public String getProvinceName() {
 		return provinceName;
 	}

+ 13 - 4
src/main/java/com/goafanti/order/bo/inuptTaskHoursListBo.java

@@ -6,13 +6,22 @@ public class inuptTaskHoursListBo {
 	private String orderNo;
 	private String taskId;
 	private String starTime;
-	private String endTime; 
+	private String endTime;
 	private String cid;
 	private String depId;
+	private String thchId;
 	private String contractNo;
 	private Integer outsource;
-	
-	
+
+
+	public String getThchId() {
+		return thchId;
+	}
+
+	public void setThchId(String thchId) {
+		this.thchId = thchId;
+	}
+
 	public String getName() {
 		return name;
 	}
@@ -67,5 +76,5 @@ public class inuptTaskHoursListBo {
 	public void setOutsource(Integer outsource) {
 		this.outsource = outsource;
 	}
-	
+
 }

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

@@ -38,6 +38,15 @@ public class managerListBo {
 	@Excel(name = "特批说明")
 	private String specialComment;
 
+	public String getProjectStatusName() {
+		return projectStatusName;
+	}
+
+	public void setProjectStatusName(String projectStatusName) {
+		this.projectStatusName = projectStatusName;
+	}
+
+
 	public String getId() {
 		return id;
 	}

+ 9 - 8
src/main/java/com/goafanti/order/controller/OrderProjectApiController.java

@@ -86,9 +86,10 @@ public class OrderProjectApiController extends CertifyApiController {
 	 * 任务派单查询
 	 */
 	@RequestMapping(value="/selectTaskList" ,method = RequestMethod.GET)
-	public Result selectTaskList(String name,String orderNo,String taskId,Integer taskStatus,String adminName,Integer specially  ,String depId  ,Integer pageNo,Integer pageSize){
+	public Result selectTaskList(String name,String orderNo,String taskId,Integer taskStatus,String adminName,Integer specially  ,String depId,String thchId
+			,Integer pageNo,Integer pageSize){
 		Result res=new Result();
-		res.setData(orderProjectService.selectTaskList( name, orderNo, taskId, taskStatus, adminName,specially ,  depId  ,pageNo, pageSize));
+		res.setData(orderProjectService.selectTaskList( name, orderNo, taskId, taskStatus, adminName,specially ,  depId,thchId  ,pageNo, pageSize));
 		return res;
 	}
 
@@ -98,11 +99,11 @@ public class OrderProjectApiController extends CertifyApiController {
 	 * 经理查询订单
 	 */
 	@RequestMapping(value="/managerSelect" ,method = RequestMethod.GET)
-	public Result managerSelect(String name,String orderNo,String contractNo,String cid,String projectType,
+	public Result managerSelect(String name,String orderNo,String contractNo,String cid,String projectType,String thchId,
 			String depId,String techDepId  ,Integer declarationBatch  ,String commodityPrice,String startTime,
 			String endTime,Integer pageNo,Integer pageSize){
 		Result res=new Result();
-		res.setData(orderProjectService.managerSelect( name, orderNo, contractNo, cid, projectType,
+		res.setData(orderProjectService.managerSelect( name, orderNo, contractNo, cid, projectType,thchId,
 				 depId, techDepId  , declarationBatch  ,commodityPrice,startTime, endTime , pageNo, pageSize));
 		return res;
 	}
@@ -112,12 +113,12 @@ public class OrderProjectApiController extends CertifyApiController {
 	 * 经理查询订单
 	 */
 	@RequestMapping(value="/exportManagerSelect" ,method = RequestMethod.GET)
-	public Result exportManagerSelect(String name,String orderNo,String contractNo,String cid,String projectType,
+	public Result exportManagerSelect(String name,String orderNo,String contractNo,String cid,String projectType,String thchId,
 			String depId,String techDepId  ,Integer declarationBatch  ,String commodityPrice,String startTime,
 			String endTime,Integer pageNo,Integer pageSize){
 		@SuppressWarnings("unchecked")
 		List<managerListBo> list=(List<managerListBo>) orderProjectService.managerSelect( name, orderNo, contractNo,
-				cid, projectType,depId, techDepId  , declarationBatch  ,commodityPrice,startTime, endTime , pageNo, pageSize).getList();
+				cid, projectType,thchId,depId, techDepId  , declarationBatch  ,commodityPrice,startTime, endTime , pageNo, pageSize).getList();
 		NewExcelUtil<managerListBo> excel=new NewExcelUtil<>(managerListBo.class);
 		return excel.exportExcel(list, "企业项目查询列表", uploadPath);
 	}
@@ -327,12 +328,12 @@ public class OrderProjectApiController extends CertifyApiController {
 	 * @throws IOException
 	 */
 	@RequestMapping(value = "/exportMyTaskList", method = RequestMethod.GET)
-	public Result exportMyTaskList(HttpServletResponse response,inuptTaskHoursListBo ib, Integer pageNo, Integer pageSize) {
+	public Result exportMyTaskList(inuptTaskHoursListBo ib, Integer pageNo, Integer pageSize) {
 		if(pageSize==null)pageSize=999999;
 		@SuppressWarnings("unchecked")
 		List<TOrderTaskListBo> list=(List<TOrderTaskListBo>) orderProjectService.taskHoursList(ib,  pageNo, pageSize).getList();
 		NewExcelUtil<TOrderTaskListBo> excel=new NewExcelUtil<>(TOrderTaskListBo.class);
-		return excel.exportExcel(list, "工时信息记录表", response);
+		return excel.exportExcel(list, "工时信息记录表",uploadPath);
 	}
 
 	/**

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

@@ -36,7 +36,7 @@ public interface OrderProjectService {
 
 
 	Pagination<TOrderTaskListBo>  selectTaskList(String name, String orderNo, String taskId, Integer taskStatus, String adminName,
-			Integer specially,String depId  , Integer pageNo, Integer pageSize);
+			Integer specially,String depId  ,String thchId, Integer pageNo, Integer pageSize);
 
 	List<TaskLogBo> TaskLogList(Integer id);
 
@@ -63,7 +63,7 @@ public interface OrderProjectService {
 
 	int updateTaskProgress(TaskProgressBo t);
 
-	Pagination<managerListBo> managerSelect(String name, String orderNo, String contractNo, String cid, String projectType, String depId,
+	Pagination<managerListBo> managerSelect(String name, String orderNo, String contractNo, String cid, String projectType,String thchId, String depId,
 			String techDepId, Integer declarationBatch, String commodityPrice, String startTime, String endTime, Integer pageNo, Integer pageSize);
 
 	int updateProjectStatus(UpdateProjectStatusBo b);

+ 5 - 3
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -814,6 +814,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		if(StringUtils.isNotBlank(ib.getContractNo()))params.put("contractNo", ib.getContractNo());
 		if(StringUtils.isNotBlank(ib.getDepId()))params.put("depId", ib.getDepId());
 		if(StringUtils.isNotBlank(ib.getCid()))params.put("cid", ib.getCid());
+		if (ib.getThchId()!=null)params.put("thchId", ib.getThchId());
 		if(null!=ib.getOutsource())params.put("outsource", ib.getOutsource());
 		Integer i=null;
 	if (TokenManager.hasRole(AFTConstants.FINANCE))i=1;
@@ -837,7 +838,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 	@SuppressWarnings("unchecked")
 	@Override
 	public Pagination<TOrderTaskListBo> selectTaskList(String name, String orderNo, String taskId, Integer taskStatus,
-			String adminName, Integer specially,String depId  , Integer pageNo, Integer pageSize) {
+			String adminName, Integer specially,String depId,String thchId  , Integer pageNo, Integer pageSize) {
 		Map<String, Object> params = new HashMap<String, Object>();
 		if(pageSize==null||pageSize<0)pageSize=10;
 		if(pageNo==null||pageNo<0)pageNo=1;
@@ -846,6 +847,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		if (StringUtils.isNotBlank(depId)) params.put("depId", depId);
 		if (StringUtils.isNotBlank(orderNo)) params.put("orderNo", orderNo);
 		if (StringUtils.isNotBlank(taskId)) params.put("taskId", taskId);
+		if (StringUtils.isNotBlank(thchId)) params.put("thchId", thchId);
 		if (StringUtils.isNotBlank(adminName)) params.put("adminName", adminName);
 		if (null != taskStatus) params.put("taskStatus", taskStatus);
 		Pagination<TOrderTaskListBo> p = (Pagination<TOrderTaskListBo>)findPage("selectTaskListByPage", "selectTaskListCount", params, pageNo, pageSize);
@@ -996,20 +998,20 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 
 	@Override
 	public Pagination<managerListBo> managerSelect(String name, String orderNo, String contractNo, String cid,
-			String projectType, String depId, String techDepId, Integer declarationBatch, String commodityPrice,
+			String projectType,String thchId, String depId, String techDepId, Integer declarationBatch, String commodityPrice,
 			String startTime,String endTime ,Integer pageNo, Integer pageSize) {
 		Map<String, Object> params = new HashMap<String, Object>();
 		if(pageSize==null||pageSize<0)pageSize=10;
 		if(pageNo==null||pageNo<0)pageNo=1;
 		params.put("aid", TokenManager.getAdminId()==null?"":TokenManager.getAdminId());
 		if (StringUtils.isNotBlank(name))params.put("name", name);
-		else params.put("name", "");
 		if (StringUtils.isNotBlank(depId)) params.put("depId", depId);
 		if (StringUtils.isNotBlank(orderNo)) params.put("orderNo", orderNo);
 		if (StringUtils.isNotBlank(contractNo)) params.put("contractNo", contractNo);
 		if (StringUtils.isNotBlank(cid)) params.put("cid", cid);
 		if (StringUtils.isNotBlank(projectType)) params.put("projectType", projectType);
 		if (StringUtils.isNotBlank(depId)) params.put("depId", depId);
+		if (StringUtils.isNotBlank(thchId))params.put("thchId", thchId);
 		if (StringUtils.isNotBlank(techDepId)) params.put("techDepId", techDepId);
 		if (StringUtils.isNotBlank(commodityPrice)) params.put("commodityPrice", commodityPrice);
 		if (StringUtils.isNotBlank(startTime)) params.put("startTime", startTime);

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

@@ -66,6 +66,7 @@ public class ProjectStatisticsServiceImpl extends BaseMybatisDao<TOrderTaskMappe
 		if(ps.getOrderNo()!=null)params.put("orderNo", ps.getOrderNo());
 		if(ps.getContractNo()!=null)params.put("contractNo", ps.getContractNo());
 		if(ps.getUserName()!=null)params.put("userName", ps.getUserName());
+		if (ps.getThchId()!=null)params.put("thchId", ps.getThchId());
 		if(ps.getDeclarationBatch()!=null)params.put("declarationBatch", ps.getDeclarationBatch());
 		if(ps.getProjectSituation()!=null)params.put("projectSituation", ps.getProjectSituation());
 		if(ps.getProjectAmount()!=null) {

+ 9 - 0
src/main/java/com/goafanti/organization/bo/InputPaymentList.java

@@ -11,12 +11,21 @@ public class InputPaymentList {
 	private String financeName;
 	private String cname;
 	private String pname;
+	private String thchId;
 	private Integer status;
 	private Integer chooseType;
 	private Integer pageSize;
 	private Integer pageNo;
 
 
+	public String getThchId() {
+		return thchId;
+	}
+
+	public void setThchId(String thchId) {
+		this.thchId = thchId;
+	}
+
 	public String getDeps() {
 		return deps;
 	}

+ 1 - 0
src/main/java/com/goafanti/organization/service/impl/ThirdPartyCompanyServiceImpl.java

@@ -672,6 +672,7 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 			map.put("deps", departmentService.parseArray(i.getDeps()));
 		}
 		if (i.getAname()!=null)map.put("aname", i.getAname());
+		if (i.getThchId()!=null)map.put("thchId", i.getThchId());
 		if (i.getFinanceName()!=null)map.put("financeName", i.getFinanceName());
 		if (i.getCname()!=null)map.put("cname", i.getCname());
 		if (i.getPname()!=null)map.put("pname", i.getPname());

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

@@ -52,7 +52,7 @@ yxjl_max=100
 amb.maxLvl=6
 
 avatar.host=//static.jishutao.com
-static.host=//static.jishutao.com/1.2.48
+static.host=//static.jishutao.com/1.2.49
 #avatar.host=//172.16.0.255:3000
 #static.host=//172.16.0.255:3000/1.2.27
 #static.host=http://172.16.1.187/prod/1.2.25

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

@@ -49,7 +49,7 @@ yxjl_max=100
 
 amb.maxLvl=6
 
-static.host=//static.jishutao.com/1.2.48
+static.host=//static.jishutao.com/1.2.49
 portal.host=//static.jishutao.com/portal/2.0.6
 avatar.host=//static.jishutao.com
 avatar.upload.host=//static.jishutao.com/upload