角色调整后，流程中对应角色调整；企业列表调整

jp-console/jeeplus-module/ly/src/main/java/com/jeeplus/dzfoprecord/controller/DzfQuestionOpRecordController.java

@@ -127,7 +127,7 @@ public class DzfQuestionOpRecordController {
 			String q_detils_state="";
 
 			//挂钩干部
-			if(userDTO.getRoleIds().equals("1910141956174053377")){
+			if(userDTO.getRoleIds().equals("1915280292672946177")){
 				if(op.getDzfQuestionDetilDTOList().get(i).current.equals("0")){
 					q_detils_state="0";//问题附表用0
 					dzfQuestionOpRecordDTO.setOpType("3");
@@ -257,7 +257,11 @@ public class DzfQuestionOpRecordController {
 					}
 					aa.setDes1(newuser);
 					aa.setDes2(newusern);
-					aa.setStates(q_detils_state);
+					//没有待办人的情况下才改状态
+					if(newuser.equals("dazoufang")){
+						aa.setStates(q_detils_state);
+					}
+
 
 
 				}else if(op.getDzfQuestionDetilDTOList().get(i).current.equals("1")){

jp-console/jeeplus-module/ly/src/main/java/com/jeeplus/lyservice/controller/LyServiceController.java

@@ -60,8 +60,8 @@ public class LyServiceController {
 		QueryWrapper queryWrapper = QueryWrapperGenerator.buildQueryCondition (lyServiceDTO, LyServiceDTO.class);
 		UserDTO userDTO = UserUtils.getCurrentUserDTO();
 		//		//挂钩干部（能看到对应企业）
-		if(userDTO.getRoleIds().equals("1910141956174053377")){
-			queryWrapper.eq ("qy.bz6", userDTO.getLoginName() ); // 排除已经删除
+		if(userDTO.getRoleIds().equals("1915280292672946177")){
+			queryWrapper.eq ("qy.des13", userDTO.getLoginName() ); // 排除已经删除
 		}
 		IPage<LyServiceDTO> result = lyServiceService.findPage (page, queryWrapper);
 		return ResponseEntity.ok (result);
@@ -105,7 +105,7 @@ public class LyServiceController {
         lyServiceService.removeByIds ( Lists.newArrayList ( idArray ) );
 		return ResponseEntity.ok( "删除服务对接成功" );
 	}
-	
+
 	/**
      * 导出服务对接数据
      *
@@ -121,7 +121,7 @@ public class LyServiceController {
         String fileName = options.getFilename ( );
 		QueryWrapper queryWrapper = QueryWrapperGenerator.buildQueryCondition (lyServiceDTO, LyServiceDTO.class);
         if ( ExportMode.current.equals ( options.getMode ( ) ) ) { // 导出当前页数据
-            
+
         } else if ( ExportMode.selected.equals ( options.getMode ( ) ) ) { // 导出选中数据
             queryWrapper.in ( "a.id", options.getSelectIds () );
         } else { // 导出全部数据

jp-console/jeeplus-module/ly/src/main/java/com/jeeplus/question/controller/DzfQuestionController.java

@@ -79,8 +79,8 @@ public class DzfQuestionController {
 
 		QueryWrapper queryWrapper = QueryWrapperGenerator.buildQueryCondition (dzfQuestionDTO, DzfQuestionDTO.class);
 		//挂钩干部（能看到对应企业）
-		if(userDTO.getRoleIds().equals("1910141956174053377")){
-			queryWrapper.eq ("ei.bz6", userDTO.getLoginName() ); // 排除已经删除
+		if(userDTO.getRoleIds().equals("1915280292672946177")){
+			queryWrapper.eq ("ei.des13", userDTO.getLoginName() ); // 排除已经删除
 		}
 		//办公室(能看到所有提交的问题)
 		if(userDTO.getRoleIds().equals("1910175386924417025")){
@@ -145,8 +145,8 @@ public class DzfQuestionController {
 			dzfQuestionDTO.setQySd(ei.getDes1());
 			dzfQuestionDTO.setQyFzr(ei.getLxr());
 			dzfQuestionDTO.setPhone(ei.getPhone());
-			dzfQuestionDTO.setOfficer(ei.getBz5());
-			dzfQuestionDTO.setOfficeName(ei.getBz6());
+			dzfQuestionDTO.setOfficer(ei.getDes14());
+			dzfQuestionDTO.setOfficeName(ei.getDes13());
 
 		}
 		//新增状态下,赋值id
@@ -174,12 +174,13 @@ public class DzfQuestionController {
 		if(type!=null&&type.equals("submit")){//提交状态，其他为暂存
 			dzfQuestionDTO.setStates("1");//新增时提交；
 			//企业提交，将挂钩干部带入到待办人中
-			dzfQuestionDTO.setDes1(ei.getBz6());
-			dzfQuestionDTO.setDes2(ei.getBz5());
+			dzfQuestionDTO.setDes1(ei.getDes13());
+			dzfQuestionDTO.setDes2(ei.getDes14());
 
 			for(int i=0;i<dzfQuestionDTO.getDzfQuestionDetilDTOList().size();i++){
-				dzfQuestionDTO.getDzfQuestionDetilDTOList().get(i).setDes1(ei.getBz6());
-				dzfQuestionDTO.getDzfQuestionDetilDTOList().get(i).setDes2(ei.getBz5());
+				dzfQuestionDTO.getDzfQuestionDetilDTOList().get(i).setDes1(ei.getDes13());
+				dzfQuestionDTO.getDzfQuestionDetilDTOList().get(i).setDes2(ei.getDes14());
+
 
 				//企业+  选择交办部门
 				dzfQuestionDTO.getDzfQuestionDetilDTOList().get(i).setDes7(dzfQuestionDTO.getDzfQuestionDetilDTOList().get(i).checkUserList);
@@ -206,8 +207,8 @@ public class DzfQuestionController {
 				dzfQuestionOpRecordDTO.setDes2(userDTO.getName());
 
 				//企业第一步提交，将挂钩干部带入到待办人中
-				dzfQuestionOpRecordDTO.setDes3(ei.getBz6());
-				dzfQuestionOpRecordDTO.setDes4(ei.getBz5());
+				dzfQuestionOpRecordDTO.setDes3(ei.getDes13());
+				dzfQuestionOpRecordDTO.setDes4(ei.getDes14());
 
 				dzfQuestionOpRecordService.saveOrUpdate (dzfQuestionOpRecordWrapper.toEntity (dzfQuestionOpRecordDTO));
 
@@ -271,7 +272,7 @@ public class DzfQuestionController {
 //
 //		QueryWrapper queryWrapper = QueryWrapperGenerator.buildQueryCondition (dzfQuestionDTO, DzfQuestionDTO.class);
 //		//挂钩干部（能看到对应企业）
-//		if(userDTO.getRoleIds().equals("1910141956174053377")){
+//		if(userDTO.getRoleIds().equals("1915280292672946177")){
 //			queryWrapper.eq ("ei.bz6", userDTO.getLoginName() ); // 排除已经删除
 //		}
 //		//办公室(能看到所有提交的问题)

jp-mobile/pages/buildList/buildList.vue

@@ -283,6 +283,7 @@
 					name:"",
 					des7:"",
 					des8:"",
+					totalNumber:"1"
 				},
 				
 				curWord: "", //当前搜索关键词

jp-mobile/pages/index/Dzfindex.vue

@@ -57,12 +57,12 @@
 					</view>
 										
 					<!-- 挂钩干部 -->
-					<view class="btn-Imbox" @click="totongxunlu25" v-if="roleIds=='1910141956174053377'">
+					<view class="btn-Imbox" @click="totongxunlu25" v-if="roleIds=='1915280292672946177'">
 						<image  class="center-img" src="/static/img/cd5.png"></image>
 						<p>服务对接</p>
 					</view>
 					<!-- 挂钩干部或大走访办公室或交办部门 -->
-					<view class="btn-Imbox" @click="totongxunlu3" v-if="roleIds=='1910141956174053377'||roleIds=='1910175386924417025'||roleIds=='1910175949166673921'">
+					<view class="btn-Imbox" @click="totongxunlu3" v-if="roleIds=='1915280292672946177'||roleIds=='1910175386924417025'||roleIds=='1910175949166673921'">
 						<image  class="center-img" src="/static/img/cd4.png"></image>
 						<p>问题处理{{p1}}</p>
 					</view>

jp-mobile/pages/question/questionInfo.vue

@@ -124,7 +124,7 @@
 				
 				
 				<!-- 挂钩干部 -->
-				<view class="cu-form-group margin-top" v-if="roleIds=='1910141956174053377'" >
+				<view class="cu-form-group margin-top" v-if="roleIds=='1915280292672946177'" >
 					<view class="title">
 						问题处理
 					</view>
@@ -168,7 +168,7 @@
 				</view>
 				
 				<!-- 挂钩干部或大走访办公室或交办部门 -->			
-				<view class="cu-form-group margin-top" v-if="roleIds=='1910175386924417025'||roleIds=='1910141956174053377'||roleIds=='1910175949166673921'" >
+				<view class="cu-form-group margin-top" v-if="roleIds=='1910175386924417025'||roleIds=='1915280292672946177'||roleIds=='1910175949166673921'" >
 					<view class="title">
 						预计办结时间
 					</view>					
@@ -206,14 +206,14 @@
 				</view>	
 				
 				
-				<view class="cu-form-group margin-top" v-if="(roleIds=='1910175386924417025'||roleIds=='1910141956174053377')&&item.showjbdw">
+				<view class="cu-form-group margin-top" v-if="(roleIds=='1910175386924417025'||roleIds=='1915280292672946177')&&item.showjbdw">
 					<view class="title">
 						交办要求
 					</view>
 					<textarea v-model="item.delyj" placeholder="请填写交办要求"  ></textarea>
 				</view>
 				
-				<view class="cu-form-group margin-top" v-if="(roleIds=='1910175386924417025'||roleIds=='1910141956174053377'||roleIds=='1910175949166673921')&&!item.showjbdw">
+				<view class="cu-form-group margin-top" v-if="(roleIds=='1910175386924417025'||roleIds=='1915280292672946177'||roleIds=='1910175949166673921')&&!item.showjbdw">
 					<view class="title">
 						处理建议
 					</view>
@@ -236,7 +236,7 @@
 				</view> -->
 				
 				
-				<view class="cu-form-group margin-top" style="border-bottom: 3px solid #eee;" v-if="roleIds=='1910175386924417025'||roleIds=='1910141956174053377'||roleIds=='1910175949166673921'">
+				<view class="cu-form-group margin-top" style="border-bottom: 3px solid #eee;" v-if="roleIds=='1910175386924417025'||roleIds=='1915280292672946177'||roleIds=='1910175949166673921'">
 					<uni-file-picker style="margin-bottom: 10px;" limit="9" ref="picFile" v-model="item.des6"
 						fileMediatype="all" mode="grid" title="附件上传" :auto-upload="autoUpload" @select="select"
 						@progress="progress" @success="success" @fail="fail" @delete="deleteFile"
@@ -482,7 +482,7 @@
 								data2.data.dzfQuestionDetilDTOList[i].current=1
 							}else if(data2.data.dzfQuestionDetilDTOList[i].oplist[j].opType=='5'){
 								//挂钩干部
-								if(this.roleIds=='1910141956174053377'){
+								if(this.roleIds=='1915280292672946177'){
 									data2.data.dzfQuestionDetilDTOList[i].current=2
 								//交办部门
 								}else{
@@ -490,7 +490,7 @@
 								}
 							}else if(data2.data.dzfQuestionDetilDTOList[i].oplist[j].opType=='6'){								
 								//挂钩干部
-								if(this.roleIds=='1910141956174053377'){
+								if(this.roleIds=='1915280292672946177'){
 									data2.data.dzfQuestionDetilDTOList[i].current=3
 								//交办部门
 								}else{
@@ -498,7 +498,7 @@
 								}
 							}else if(data2.data.dzfQuestionDetilDTOList[i].oplist[j].opType=='7'){
 								//挂钩干部
-								if(this.roleIds=='1910141956174053377'){
+								if(this.roleIds=='1915280292672946177'){
 									data2.data.dzfQuestionDetilDTOList[i].current=4
 								//交办部门
 								}else{
@@ -506,7 +506,7 @@
 								}
 							}else if(data2.data.dzfQuestionDetilDTOList[i].oplist[j].opType=='8'){
 								//挂钩干部
-								if(this.roleIds=='1910141956174053377'){
+								if(this.roleIds=='1915280292672946177'){
 									data2.data.dzfQuestionDetilDTOList[i].current=5
 								//交办部门
 								}else{
@@ -611,7 +611,7 @@
 						}
 					}
 				//挂钩干部	
-				}else if(this.roleIds=='1910141956174053377'){
+				}else if(this.roleIds=='1915280292672946177'){
 					
 					console.log("选择："+evt.detail.value);
 					for (let i = 0; i < this.dels.length; i++) {