大走访办公室角色添加删除功能；添加板块账号，板块账号能查看板块的所有问题；

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

@@ -87,9 +87,15 @@ public class DzfQuestionController {
 			queryWrapper.ne ("a.states", "0" ); // 排除已经删除
 		}
 		//办理部门
-		if(userDTO.getRoleIds().equals("1910175949166673921")){
+		if(userDTO.getRoleIds().equals("1910175949166673921")&&!userDTO.getNo().equals("2")){
 			IPage<DzfQuestionDTO> result = dzfQuestionService.findPage2 (page, queryWrapper,"1",userDTO.getLoginName());
 			return ResponseEntity.ok (result);
+		}else if(userDTO.getRoleIds().equals("1910175949166673921")&&userDTO.getNo().equals("2")){
+			String area=getDes1(userDTO.getOfficeDTO().getName());
+			queryWrapper.eq("a.qy_sd",area);
+			//IPage<DzfQuestionDTO> result = dzfQuestionService.findPage22 (page, queryWrapper,area,userDTO.getLoginName());
+			IPage<DzfQuestionDTO> result = dzfQuestionService.findPage (page, queryWrapper,"0",userDTO.getLoginName());
+			return ResponseEntity.ok (result);
 		}else{
 			IPage<DzfQuestionDTO> result = dzfQuestionService.findPage (page, queryWrapper,ismy,userDTO.getLoginName());
 			return ResponseEntity.ok (result);
@@ -97,6 +103,52 @@ public class DzfQuestionController {
 
 	}
 
+	private String getDes1(String officename){
+		String area="";
+		switch (officename) {
+			case "学富镇":
+				area = "学富";
+				break;
+			case "大冈镇":
+				area = "大冈";
+				break;
+			case "秦南镇":
+				area = "秦南";
+				break;
+			case "盐渎街道":
+				area = "盐渎";
+				break;
+			case "郭猛镇":
+				area = "郭猛";
+				break;
+			case "楼王镇":
+				area = "楼王";
+				break;
+			case "龙冈镇":
+				area = "龙冈";
+				break;
+			case "台创园":
+				area = "台创园";
+				break;
+			case "高新区":
+				area = "高新区";
+				break;
+			case "潘黄街道":
+				area = "潘黄";
+				break;
+			case "大纵湖镇":
+				area = "大纵湖";
+				break;
+			case "尚庄镇":
+				area = "尚庄";
+				break;
+			case "张庄街道":
+				area = "张庄";
+				break;
+		}
+
+		return area;
+	}
 
 	/**
 	 * 根据Id获取问题诉求数据

jp-console/jeeplus-module/ly/src/main/java/com/jeeplus/question/mapper/DzfQuestionMapper.java

@@ -37,6 +37,7 @@ public interface DzfQuestionMapper extends BaseMapper<DzfQuestion> {
      */
     IPage <DzfQuestionDTO> findList(Page <DzfQuestionDTO> page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper,String ismy,String username);
     IPage <DzfQuestionDTO> findList2(Page <DzfQuestionDTO> page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper,String ismy,String username);
+    IPage <DzfQuestionDTO> findList22(Page <DzfQuestionDTO> page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper,String area,String username);
 
     HashMap<Object, Object> getProgressMonth(@Param("start")String start,@Param("end")String end);
 

jp-console/jeeplus-module/ly/src/main/java/com/jeeplus/question/mapper/xml/DzfQuestionMapper.xml

@@ -41,6 +41,12 @@
 		LEFT JOIN dzf_question_detil b on b.qid=a.id
 	</sql>
 
+	<sql id="dzfQuestionJoins3">
+
+		LEFT JOIN dzf_question_detil b on b.qid=a.id
+		LEFT JOIN ly_enterprise_info c ON c.id = a.qy_id
+	</sql>
+
 
 	<select id="findById" resultType="com.jeeplus.question.service.dto.DzfQuestionDTO">
 		SELECT
@@ -71,6 +77,17 @@
 		group by a.id
 	</select>
 
+	<select id="findList22" resultType="com.jeeplus.question.service.dto.DzfQuestionDTO" >
+		SELECT
+		<include refid="dzfQuestionColumns"/>
+		FROM dzf_question a
+		<include refid="dzfQuestionJoins3"/>
+		${ew.customSqlSegment}
+		and c.des1=#{area}
+		group by a.id
+	</select>
+
+
 	<select id="getProgressMonth" resultType="Map"  parameterType="String">
 		SELECT COUNT(*) allque, COUNT(CASE WHEN states != 0 THEN 1 END) AS unfinish
 		FROM dzf_question_detil WHERE del_flag = 0 AND states IS NOT NULL

jp-console/jeeplus-module/ly/src/main/java/com/jeeplus/question/service/DzfQuestionService.java

@@ -65,6 +65,11 @@ public class DzfQuestionService extends ServiceImpl<DzfQuestionMapper, DzfQuesti
 		return  baseMapper.findList2 (page, queryWrapper,ismy,username);
 	}
 
+	public IPage <DzfQuestionDTO> findPage22(Page <DzfQuestionDTO> page, QueryWrapper queryWrapper,String area,String username) {
+		queryWrapper.eq ("a.del_flag", 0 ); // 排除已经删除
+		return  baseMapper.findList22 (page, queryWrapper,area,username);
+	}
+
 	/**
 	* 保存或者更新
 	* @param  dzfQuestionDTO
@@ -391,4 +396,4 @@ public class DzfQuestionService extends ServiceImpl<DzfQuestionMapper, DzfQuesti
 		allList.put("three",continueList3);
 		return allList;
 	}
-}
+}

jp-mobile/api/auth/loginService.js

@@ -368,6 +368,16 @@ export default {
 		})
 	},
 	
+	deleteQuestion: function(ids) {
+		return request({
+			url: '/question/dzfQuestion/delete',
+			method: 'delete',
+			params: {
+				ids: ids
+			}
+		})
+	},
+	
 	save2OpRecord: function(params) {
 		return request({
 			url: '/dzfoprecord/dzfQuestionOpRecord/save2',

jp-mobile/pages/question/questionInfo.vue

@@ -334,6 +334,7 @@
 			<view style="height: 40rpx;"></view>
 			<view class="flexC" v-if="cansubmit">
 				<button v-if="roleIds=='38a14f1f42ed424eab4cb5d489596b0d'" @click="save" class="bt1  block  margin-tb-sm lg">暂存</button>
+				<button v-if="roleIds=='1910175386924417025'" @click="del" class="bt1  block  margin-tb-sm lg bg-red">删除</button>
 				<button form-type="submit" class="bt1 cu-btn block bg-blue margin-tb-sm lg">提交</button>
 			</view>
 			
@@ -902,6 +903,28 @@
 					});
 				}
 			},
+			del(){
+				let id=this.inputForm.id;								
+				uni.showModal({
+					title: '提示',
+					content: '您确认删除此条问题诉求吗？',
+					showCancel: true,
+					success: (res) => {
+						if (res.confirm) {
+							loginService.deleteQuestion(id).then(({data})=>{
+								uni.showToast({
+									title: data,
+									icon:"success"
+								})
+								
+								uni.redirectTo({
+									url: '/pages/question/questionList'
+								})
+							})
+						}
+					}
+				});
+			},
 			save(){
 				console.log("交办单位："+this.checkUserList)
 				

jp-ui/src/views/modules/enterpriseinfo/EnterpriseInfoForm.vue

@@ -119,6 +119,24 @@
                  </el-form-item>
               </el-col>
 
+              <el-col :span="8">
+                  <el-form-item label="挂钩干部" prop="des14"
+                      :rules="[
+                        {required: true, message:'挂钩干部不能为空', trigger:'blur'}
+                       ]">
+                    <el-input v-model="inputForm.des14" placeholder="请填写挂钩干部"     ></el-input>
+                 </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                  <el-form-item label="挂钩干部手机" prop="des13"
+                      :rules="[
+                        {required: true, message:'挂钩干部手机不能为空', trigger:'blur'},
+                        {validator: validator.isMobile, trigger:'blur'}
+                       ]">
+                    <el-input v-model="inputForm.des13" placeholder="请填写挂钩干部手机"     ></el-input>
+                 </el-form-item>
+              </el-col>
+
 
               </el-row>
 
@@ -203,6 +221,8 @@
           bz6: '',
           des10: '',
           des11: '',
+          des13: '',
+          des14: '',
         },
 
         electdataList: [],