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

总结:
1、科德系统项其他问题处理
2、管理系统技术部需求字段新增
3、管理系统修改部门接口修改
4、管理系统需求修改接口修改

anderx лет назад: 5
Родитель
Сommit
85155c3c9a

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

@@ -380,6 +380,9 @@
       <if test="financeId != null">
         finance_id = #{financeId,jdbcType=VARCHAR},
       </if>
+      <if test="province != null">
+        province = #{province},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -526,6 +529,7 @@
 		a.status,
 		a.abbreviation,
 		a.finance_id financeId,
+		a.province,
 		c.name financeName,
 		b.name as managerName
 	from department a 

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

@@ -1805,4 +1805,92 @@ ifnull(ttm.party_amount,0) partyAmount,a.commodity_price commodityPrice,a.outsou
    b on a.business_project_id =b.commodity_id 
    where a.`type` =1 and a.aid = #{aid} and a.uid = #{uid}
   </select>
+  
+  
+  <select id="selectProjectStatisticsListByPage" resultType="com.goafanti.order.bo.OutProjectStatistics">
+ 	select  a.task_distribution_time distributionTime ,d.name province  ,c.name depName,e.salesman_name salesmanName,b.contract_no contractNo ,
+	b.order_no orderNo ,e.buyer_name userName,bc.cname ,a.commodity_name pname,ta.name techName,td.name techDepName,
+	a.status projectStatus , a.set_up_status setUpStatus ,a.set_up_time setUpTime ,a.spot_check_status spotCheckStatus,
+	b.contact_mobile contactMobile , b.legal_person_tel legalPersonTel ,a.certificate_number certificateNumber,
+	a.declaration_batch declarationBatch ,a.commodity_quantity commodityQuantity , a.commodity_price commodityPrice  
+	from t_order_task a left join t_order_new b on a.order_no =b.order_no left join department c on b.order_dep =c.id left join district_glossory d on c.id=d.id 
+	left join t_order_mid e on b.order_no =e.order_no left join business_project bp on a.commodity_id =bp.id left join business_category bc on bp.cid =bc.id 
+	left join t_task_mid ttm on a.id=ttm.tid left join admin ta on a.task_receiver =ta.id left join department td on ta.department_id =td.id
+	where 1=1
+    <if test="startDate != null and endDate != null">
+  	and a.task_distribution_time between #{startDate} and #{endDate}
+  	</if>
+  	<if test="depId !=null">
+	and b.order_dep = #{depId}
+  	</if>
+  	<if test="thchDepId !=null">
+	and td.id= #{thchDepId}
+  	</if>
+  	<if test="projectStatus !=null">
+	and bc.id= #{projectStatus}
+  	</if>
+  	<if test="projectType !=null">
+	and bp.type= #{projectType}
+  	</if>
+  	<if test="orderNo !=null">
+	and b.order_no = #{orderNo}
+	</if>
+	<if test="contractNo !=null">
+	and b.contract_no = #{contractNo}
+	</if>
+	<if test="userName !=null">
+	and e.buyer_name like concat( #{userName},'%')
+	</if> 
+	<if test="declarationBatch !=null">
+	and a.declaration_batch = #{declarationBatch}
+	</if>
+	<if test="projectSituation !=null">
+	and a.status = #{projectSituation}
+	</if>
+	<if test="amountStart !=null and amountEnd != null">
+	and a.commodity_price between #{amountStart} and #{amountEnd}
+	</if>
+  	<if test="page_sql!=null">
+			${page_sql}
+	</if>
+  </select>
+  
+  <select id="selectProjectStatisticsCount" resultType="java.lang.Integer">
+ 	select  count(*)
+	from t_order_task a left join t_order_new b on a.order_no =b.order_no  left join department c on b.order_dep =c.id  left join district_glossory d on c.id=d.id 
+	left join t_order_mid e on b.order_no =e.order_no left join business_project bp on a.commodity_id =bp.id left join business_category bc on bp.cid =bc.id 
+	 left join admin ta on a.task_receiver =ta.id left join department td on ta.department_id =td.id
+	where 1=1
+  <if test="startDate != null and endDate != null">
+  	and a.task_distribution_time between #{startDate} and #{endDate}
+  	</if>
+  	<if test="depId !=null">
+	and b.order_dep = #{depId}
+  	</if>
+  	<if test="thchDepId !=null">
+	and td.id= #{thchDepId}
+  	</if>
+  	<if test="projectStatus !=null">
+	and bc.id= #{projectStatus}
+  	</if>
+  	<if test="projectType !=null">
+	and bp.type= #{projectType}
+  	</if>
+  	<if test="orderNo !=null">
+	and b.order_no = #{orderNo}
+	</if>
+	<if test="contractNo !=null">
+	and b.contract_no = #{contractNo}
+	</if>
+	<if test="userName !=null">
+	and e.buyer_name like concat( #{userName},'%')
+	</if> 
+	<if test="declarationBatch !=null">
+	and a.declaration_batch = #{declarationBatch}
+	</if>
+	<if test="amountStart !=null and amountEnd != null">
+	and a.commodity_price between #{amountStart} and #{amountEnd}
+	</if>
+  </select>
+  
 </mapper>

+ 14 - 0
src/main/java/com/goafanti/common/model/OrganizationManagement.java

@@ -73,6 +73,12 @@ public class OrganizationManagement {
 	 * 负责财务id
 	 */
 	private String financeId;
+	
+	
+	/**
+	 * 	省份
+	 */
+	private Integer province;
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column organization_management.id
 	 * @return  the value of organization_management.id
@@ -305,4 +311,12 @@ public class OrganizationManagement {
 	public void setFinanceId(String financeId) {
 		this.financeId = financeId;
 	}
+
+	public Integer getProvince() {
+		return province;
+	}
+
+	public void setProvince(Integer province) {
+		this.province = province;
+	}
 }

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

@@ -408,8 +408,13 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		if (t.getStatus()!=null) {
 			if (t.getStatus()!=task2.getStatus()) {
 				String s="将当前项目状态修改为";
-				if (t.getStatus()==0)s+="开启";
-				if (t.getStatus()==1)s+="暂停";
+				//0未开始 1已开始 2已暂停 3已完成 4已驳回 5已退单
+				if (t.getStatus()==0)s+="未开始";
+				else if (t.getStatus()==1)s+="已开始";
+				else if (t.getStatus()==2)s+="已暂停";
+				else if (t.getStatus()==3)s+="已完成";
+				else if (t.getStatus()==4)s+="已驳回";
+				else if (t.getStatus()==5)s+="以退单";
 				tl.setContent(s);
 				taskLogMapper.insertSelective(tl);
 			}

+ 8 - 0
src/main/java/com/goafanti/organization/bo/OrganizationListOut.java

@@ -38,6 +38,8 @@ public class OrganizationListOut {
 	private String financeName;
 	
 	private String financeId;
+	private Integer province;
+	
 	public String getUid() {
 		return uid;
 	}
@@ -146,6 +148,12 @@ public class OrganizationListOut {
 	public void setFinanceName(String financeName) {
 		this.financeName = financeName;
 	}
+	public Integer getProvince() {
+		return province;
+	}
+	public void setProvince(Integer province) {
+		this.province = province;
+	}
 	
 	
 	

+ 3 - 3
src/main/java/com/goafanti/organization/controller/AdminOrganizationController.java

@@ -106,7 +106,7 @@ public class AdminOrganizationController extends BaseApiController{
 	}
 	/**修改信息**/
 	@RequestMapping(value = "/updateOrganization" , method = RequestMethod.POST)
-	public Result updateOrganization(String name, String type, String managerId, String superId, String status,
+	public Result updateOrganization(String name, String type, String managerId, String superId, String status,Integer province,
 			String remarks,String id,String abbreviation,String financeId){
 		Result res = new Result();
 		if(StringUtils.isBlank(name) || StringUtils.isBlank(type)
@@ -134,7 +134,7 @@ public class AdminOrganizationController extends BaseApiController{
 				}
 				sid=organizationManagementMapper.selectIdByDepNo(dep);				
 			}
-			i=organizationService.updateOrganization(name, type, managerId, superId, status, remarks,id,dep,abbreviation,financeId);
+			i=organizationService.updateOrganization(name, type, managerId, superId, status, province,remarks,id,dep,abbreviation,financeId);
 		}
 		if(Count>=10){
 			String dep=sdepNo+Count;
@@ -144,7 +144,7 @@ public class AdminOrganizationController extends BaseApiController{
 				dep=sdepNo+Count;
 				sid=organizationManagementMapper.selectIdByDepNo(dep);				
 			}
-			i=organizationService.updateOrganization(name, type, managerId, superId, status, remarks,id,dep,abbreviation,financeId);
+			i=organizationService.updateOrganization(name, type, managerId, superId, status, province,remarks,id,dep,abbreviation,financeId);
 		}
 		
 		return res.data(i);

+ 2 - 1
src/main/java/com/goafanti/organization/service/OrganizationService.java

@@ -39,6 +39,7 @@ public interface OrganizationService {
 	
 	int deleteById(String id);
 	
-	int updateOrganization(String name,String type,String managerId,String superId,String status,String remarks,String id,String depn,String abbreviation,String financeId);
+	int updateOrganization(String name,String type,String managerId,String superId,String status,Integer province,
+			String remarks,String id,String depn,String abbreviation,String financeId);
 	
 }

+ 3 - 1
src/main/java/com/goafanti/organization/service/impl/OrganizationServiceImpl.java

@@ -99,7 +99,8 @@ public class OrganizationServiceImpl extends BaseMybatisDao<OrganizationManageme
 		return 1;
 	}
 	@Override
-	public int updateOrganization(String name, String type, String managerId, String superId, String status,String remarks,String id,String depn,String abbreviation,String financeId) {
+	public int updateOrganization(String name, String type, String managerId, String superId, String status,Integer province,
+			String remarks,String id,String depn,String abbreviation,String financeId) {
 		Date now=new Date();
 		OrganizationManagement om=new OrganizationManagement();
 		om.setName(name);
@@ -113,6 +114,7 @@ public class OrganizationServiceImpl extends BaseMybatisDao<OrganizationManageme
 		om.setId(id);
 		om.setAbbreviation(abbreviation);
 		om.setFinanceId(financeId);
+		om.setProvince(province);
 		tOrderMidMapper.updateFinanceId(id,financeId);
 		int x=organizationManagementMapper.updateByPrimaryKeySelective(om);
 		//*******下级编号修改

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

@@ -1,8 +1,8 @@
 #Driver
 jdbc.driverClassName=com.mysql.jdbc.Driver
 #本地
-#jdbc.url=jdbc\:mysql\://localhost\:3306/aft?useUnicode\=true&characterEncoding\=UTF-8&autoReconnect\=true&useSSL\=false
-#jdbc.username=dev
+#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
@@ -69,7 +69,7 @@ avatar.upload.host=//sb.jishutao.com/upload
 
 #连测试
 avatar.host=//static.jishutao.com
-static.host=//static.jishutao.com/1.1.60
+static.host=//static.jishutao.com/1.1.61
 
 upload.path=F:/data/public/upload
 upload.private.path=F:/data/private/upload