feat: 民主评议党员增加不合格处置情况

src/main/java/com/ghsc/partybuild/controller/PartyTwoController.java

@@ -1201,6 +1201,14 @@ public class PartyTwoController {
         return result;
     }
 
+    @ResponseBody
+    @GetMapping("/getMzpybhgclqkList")
+    public RequsetData<List<HashMap<String, Object>>> getMzpybhgclqkList() {
+        RequsetData<List<HashMap<String, Object>>> result = new RequsetData<>();
+        result.setItem(partyTwoService.getMzpybhgclqkList());
+        return result;
+    }
+
     @ResponseBody
     @GetMapping("/getMzpyxxList")
     public RequsetData<PageInfo<HashMap<String, Object>>> getMzpyxxList(@RequestParam("pageindex") int pageIndex, @RequestParam("pagesize") int pageSize,

src/main/java/com/ghsc/partybuild/mapper/PartyTwoCQuery.java

@@ -86,6 +86,8 @@ public interface PartyTwoCQuery {
 
     List<HashMap<String, Object>> selectMzpyjgList();
 
+    List<HashMap<String, Object>> selectMzpybhgclqkList();
+
     List<HashMap<String, Object>> selectleaderUserList(@Param("username") String username,
                                                        @Param("usertype") Integer usertype);
 

src/main/java/com/ghsc/partybuild/service/PartyTwoService.java

@@ -108,6 +108,8 @@ public interface PartyTwoService {
 
     List<HashMap<String, Object>> getMzpyjgList();
 
+    List<HashMap<String, Object>> getMzpybhgclqkList();
+
     PageInfo<HashMap<String, Object>> getMzpyxxList(int page, int rows, String username, String rybm, String dzzdm, String beginTime, String endTime, String pyjg);
     ZzMzpyxxVo getMzpyById(String id);
     int saveMzpy(ZzMzpyxxVo data);

src/main/java/com/ghsc/partybuild/service/impl/PartyTwoServiceImpl.java

@@ -901,6 +901,12 @@ public class PartyTwoServiceImpl implements PartyTwoService {
         return list;
     }
 
+    @Override
+    public List<HashMap<String, Object>> getMzpybhgclqkList() {
+        List<HashMap<String, Object>> list = partyTwoCquery.selectMzpybhgclqkList();
+        return list;
+    }
+
     public ZzMzpyxxVo getMzpyById(String id) {
         if (!StringUtils.isNotBlank(id))
             return null;

src/main/resources/mapping/PartyTwoCQuery.xml

@@ -488,11 +488,16 @@
         select *
         from ZZZD_PYJG
     </select>
+    <select id="selectMzpybhgclqkList" resultType="java.util.HashMap">
+        select *
+        from ZZZD_PXBHGCLQK
+    </select>
     <select id="selectMzpyxxList" resultType="java.util.HashMap">
-        select zz.DZZMC,ry.XM, p.*,pyjg.HZMC as PYJGMC from ZZ_MZPYXX p
+        select zz.DZZMC,ry.XM, p.*,pyjg.HZMC as PYJGMC, pxbhgcl.HZMC AS PXBHGCLMCfrom ZZ_MZPYXX p
         inner join ZZ_ZZQKXX zz on p.SZDZBDM=ZZ.DZZDM
         inner join VM_RYJBXX ry on p.RYBM = ry.RYBM
         inner join ZZZD_PYJG pyjg on p.PYJG=pyjg.BM
+        LEFT JOIN ZZZD_PXBHGCLQK pxbhgcl ON p.PYJCQK = pxbhgcl.BM
         where 1=1
         <if test="rybm != null and rybm != ''">
             and p.rybm = #{rybm}

src/main/resources/static/app/main/partyTwoExt/mzpyxx/edit.html

@@ -64,6 +64,21 @@
                                           class="error">必填.</span>
                                 </td>
                             </tr>
+                            <tr ng-if="dataModel.pyjg == '30'">
+                                <th>
+                                    不合格处置情况
+                                </th>
+                                <td ng-class="{ 'has-error' : this.editForm.pyjcqk.$invalid && this.editForm.$submitted}">
+                                    <select class="form-control form-control show-tick"
+                                            ng-model="dataModel.pyjcqk"
+                                            ng-options="type.BM as type.HZMC for type in pyczqkList"
+                                            name="pyjcqk">
+                                        <option value="">--请选择--</option>
+                                    </select>
+                                    <span ng-show="this.editForm.pyjcqk.$invalid &&  this.editForm.$submitted"
+                                          class="error">必填.</span>
+                                </td>
+                            </tr>
                         </table>
                     </div>
                     <div class="form_foot">

src/main/resources/static/app/main/partyTwoExt/mzpyxx/list.js

@@ -121,6 +121,17 @@
 
             });
         };
+        $scope.getPyczqkList = function () {
+            $http({
+                method: 'get',
+                url: '../../api/partyTowExt/getMzpybhgclqkList',
+                params: { }
+            }).then(function (result) {
+                $scope.pyczqkList = result.data.item;
+            }, function (resp) {
+
+            });
+        };
 
         $scope.edit = function (id) {
             editModal.params = {
@@ -163,6 +174,7 @@
         };
         //数据初始化
         $scope.getPyjgList();
+        $scope.getPyczqkList();
 
         $scope.showMsg = function (title, content) {
             $alert({