Merge branch 'main' of https://github.com/wanggeng888/system-partybuilding into main

src/main/java/com/cm/partybuilding/controller/resources/partyorganize/PartyOrganizeResourceController.java

@@ -156,9 +156,8 @@ public class PartyOrganizeResourceController extends AbstractController {
     })
     @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
     @GetMapping("bigdata" + ISystemConstant.APP_RELEASE_SUFFIX)
-    SuccessResultData<Map<String, Object>> bigData(@RequestParam("belongLevel") String belongLevel) throws SearchException {
+    SuccessResultData<Map<String, Object>> bigData() throws SearchException {
         Map<String, Object> params = requestParams();
-        params.put("belongLevel", belongLevel);
         return partyOrganizeService.bigData(params);
     }
 

src/main/java/com/cm/partybuilding/pojo/dtos/partyorganize/PartyOrganizeDTO.java

@@ -82,6 +82,10 @@ public class PartyOrganizeDTO {
     private String creatTime;
     @ApiModelProperty(name = "remake", value = "备注")
     private String remake;
+    @ApiModelProperty(name = "belongStreet", value = "所属街镇村ID")
+    private String belongStreet;
+    @ApiModelProperty(name = "belongStreetName", value = "所属街镇村名称")
+    private String belongStreetName;
 
     public String getPartyOrganizeId() {
         return partyOrganizeId == null ? "" : partyOrganizeId.trim();
@@ -351,5 +355,19 @@ public class PartyOrganizeDTO {
         this.remake = remake;
     }
 
+    public String getBelongStreet() {
+        return belongStreet == null ? "" : belongStreet;
+    }
 
+    public void setBelongStreet(String belongStreet) {
+        this.belongStreet = belongStreet;
+    }
+
+    public String getBelongStreetName() {
+        return belongStreetName == null ? "" : belongStreetName;
+    }
+
+    public void setBelongStreetName(String belongStreetName) {
+        this.belongStreetName = belongStreetName;
+    }
 }

src/main/java/com/cm/partybuilding/pojo/vos/partyorganize/PartyOrganizeVO.java

@@ -77,6 +77,10 @@ public class PartyOrganizeVO {
     private String creatTime;
     @ApiModelProperty(name = "remake", value = "备注")
     private String remake;
+    @ApiModelProperty(name = "belongStreet", value = "所属街镇村ID")
+    private String belongStreet;
+    @ApiModelProperty(name = "belongStreetName", value = "所属街镇村名称")
+    private String belongStreetName;
 
     public String getIntroduction() {
         return introduction == null ? "" : introduction.trim();
@@ -310,5 +314,19 @@ public class PartyOrganizeVO {
         this.remake = remake;
     }
 
+    public String getBelongStreet() {
+        return belongStreet == null ? "" : belongStreet;
+    }
 
+    public void setBelongStreet(String belongStreet) {
+        this.belongStreet = belongStreet;
+    }
+
+    public String getBelongStreetName() {
+        return belongStreetName == null ? "" : belongStreetName;
+    }
+
+    public void setBelongStreetName(String belongStreetName) {
+        this.belongStreetName = belongStreetName;
+    }
 }

src/main/resources/mybatis/mapper/partyorganize/partyorganize-mapper.xml

@@ -37,6 +37,8 @@
         <result column="position" property="position"/>
         <result column="creat_time" property="creatTime"/>
         <result column="remake" property="remake"/>
+        <result column="belong_street" property="belongStreet"/>
+        <result column="belong_street_name" property="belongStreetName"/>
     </resultMap>
 
     <!-- 新增党组织 -->
@@ -72,6 +74,8 @@
             position,
             creat_time,
             remake,
+            belong_street,
+            belong_street_name,
             creator,
             gmt_create,
             modifier,
@@ -108,6 +112,8 @@
             #{position},
             #{creatTime},
             #{remake},
+            #{belongStreet},
+            #{belongStreetName},
             #{creator},
             #{gmtCreate},
             #{modifier},
@@ -233,6 +239,12 @@
         </if>
         <if test="remake != null and remake != ''">
             remake = #{remake},
+        </if>
+        <if test="belongStreet != null and belongStreet != ''">
+            belong_street = #{belongStreet},
+        </if>
+        <if test="belongStreetName != null and belongStreetName != ''">
+            belong_street_name = #{belongStreetName},
         </if>
             modifier = #{modifier},
             gmt_modified = #{gmtModified}
@@ -272,6 +284,8 @@
             t1.position,
             t1.creat_time,
             t1.remake,
+            t1.belong_street,
+            t1.belong_street_name,
             t1.party_organize_id
         FROM
             gen_party_organize t1
@@ -318,6 +332,8 @@
             t1.position,
             t1.creat_time,
             t1.remake,
+            t1.belong_street,
+            t1.belong_street_name,
             t1.party_organize_id
         FROM
             gen_party_organize t1
@@ -428,6 +444,8 @@
             t1.position,
             t1.creat_time,
             t1.remake,
+            t1.belong_street,
+            t1.belong_street_name,
             t1.party_organize_id
         FROM
             gen_party_organize t1
@@ -436,6 +454,10 @@
         <if test="belongLevel != null and belongLevel != ''">
             AND t1.belong_level = #{belongLevel}
         </if>
+        <if test="partyOrganizeId != null and partyOrganizeId != ''">
+            AND
+            t1.party_organize_id = #{partyOrganizeId}
+        </if>
     </select>
 
     <!-- 党组织统计  -->

src/main/resources/static/route/defaultindex/include.html

@@ -16,14 +16,16 @@
         .tab{margin-bottom: 10px;float: right;width: 74%;height:140px;overflow-y: auto}
         .top:after, .tab:after, .list:after{content: '';display: block;clear: both}
         .logo-box{float: left;width:25%;}
-        .logo{max-width: 100%;height:205px;}
+        .logo{max-width: 100%;height:183px;}
         .box h3{white-space: nowrap;overflow: hidden;text-overflow: ellipsis;font-size: 18px;font-weight: normal;color: #000;}
         .list-box{float:left;width: 32%;margin-right: 2%;padding: 5px;box-sizing: border-box;border-radius: 5px}
         .list-box:last-child{margin-right: 0}
         .list-box h4{font-size: 16px;font-weight: normal;color: #000;}
         .list-box ul li{height: 35px;color: #000;border-bottom: 1px solid #DDD;font-size: 0}
         .list-box ul li a{display:inline-block;margin-right:5px;color: #000;text-decoration: none;font-size: 14px;line-height: 35px;vertical-align: top;}
-        .list-box ul li span{float:right;font-size: 14px;line-height: 35px;display: inline-block;max-width: 70%;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;vertical-align: top;}</style>
+        .list-box ul li span{float:right;font-size: 14px;line-height: 35px;display: inline-block;max-width: 70%;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;vertical-align: top;}
+        .layui-card-body{padding: 0 15px;}
+    </style>
     <script type="text/javascript" src="assets/js/jquery-3.5.1.min.js"></script>
     <script type="text/javascript" src="assets/js/vue.min.js"></script>
 </head>
@@ -36,25 +38,23 @@
                     <img :src="'route/file/downloadfile/false/' + partyOrganizeData.logo" alt="" class="logo">
                 </div>
                 <div class="layui-col-md6" style="width: 739px;">
-                    <div class="layui-card" style="background-color: transparent">
+                    <div class="layui-card-body">
-                        <div class="layui-card-body">
+                        <div class="layui-carousel layadmin-carousel layadmin-backlog" lay-anim="" lay-indicator="inside" lay-arrow="none" style="width: 100%; height: 280px;background-color: transparent">
-                            <div class="layui-carousel layadmin-carousel layadmin-backlog" lay-anim="" lay-indicator="inside" lay-arrow="none" style="width: 100%; height: 280px;background-color: transparent">
+                            <div style="background-color: transparent">
-                                <div style="background-color: transparent">
+                                <ul class="layui-row layui-col-space10 layui-this" v-cloak>
-                                    <ul class="layui-row layui-col-space10 layui-this" v-cloak>
+                                    <li class="layui-col-xs6" v-for="tab in tabList" style="width: 236px;">
-                                        <li class="layui-col-xs6" v-for="tab in tabList" style="width: 236px;">
+                                        <a @click="showPartyMemberList(tab.url, tab.count, tab.msgTitle);" href="javascript:void(0)" class="layadmin-backlog-body">
-                                            <a @click="showPartyMemberList(tab.url, tab.count, tab.msgTitle);" href="javascript:void(0)" class="layadmin-backlog-body">
+                                            <h3>{{tab.title}}</h3>
-                                                <h3>{{tab.title}}</h3>
+                                            <p><cite>{{tab.dataCount}}</cite></p>
-                                                <p><cite>{{tab.dataCount}}</cite></p>
+                                        </a>
-                                            </a>
+                                    </li>
-                                        </li>
+                                    <li class="layui-col-xs6" v-for="item in orgThreeMeetLessonCount" style="width: 236px;">
-                                        <li class="layui-col-xs6" v-for="item in orgThreeMeetLessonCount" style="width: 236px;">
+                                        <a href="javascript:void(0)" class="layadmin-backlog-body">
-                                            <a href="javascript:void(0)" class="layadmin-backlog-body">
+                                            <h3>{{item.categoryName}}</h3>
-                                                <h3>{{item.categoryName}}</h3>
+                                            <p><cite>{{item.counts}}</cite></p>
-                                                <p><cite>{{item.counts}}</cite></p>
+                                        </a>
-                                            </a>
+                                    </li>
-                                        </li>
+                                </ul>
-                                    </ul>
-                                </div>
                             </div>
                         </div>
                     </div>

src/main/resources/static/route/partyorganize/save-partyorganize.html

@@ -84,6 +84,17 @@
                         </script>
                     </div>
                 </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">所属村镇街<span style="color:red;">*</span></label>
+                    <div class="layui-input-block">
+                        <select id="belongStreet" name="belongStreet" lay-verify="required">
+                            <option value="">请选择街镇村</option>
+                            <option value="7ed23f06-566d-43b7-acd9-4f0b5db08974">稀土路街道办事处</option>
+                            <option value="6e922367-f21f-4daf-b38c-c55a67d9a35b">民馨路街道办事处</option>
+                            <option value="8d62a0cc-2c15-4355-906c-6720f8f3617e">万水泉镇</option>
+                        </select>
+                    </div>
+                </div>
                 <div class="layui-form-item">
                     <label class="layui-form-label">自治区</label>
                     <div class="layui-input-block layui-form" id="areaSelectTemplateBox" lay-filter="areaSelectTemplateBox"></div>
@@ -734,6 +745,7 @@
                 var loadLayerIndex;
                 formData.field['introduction'] = wangEditorObj['introduction'].txt.html();
                 formData.field['remake'] = wangEditorObj['remake'].txt.html();
+                formData.field.belongStreetName = $('#belongStreet').find('option:selected').text();
                 top.restAjax.post(top.restAjax.path('api/partyorganize/savepartyorganize', []), formData.field, null, function(code, data) {
                     var layerIndex = top.dialog.msg(top.dataMessage.commitSuccess, {
                         time: 0,

src/main/resources/static/route/partyorganize/update-partyorganize.html

@@ -84,6 +84,17 @@
                         </script>
                     </div>
                 </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">所属村镇街<span style="color:red;">*</span></label>
+                    <div class="layui-input-block">
+                        <select id="belongStreet" name="belongStreet" lay-verify="required">
+                            <option value="">请选择街镇村</option>
+                            <option value="7ed23f06-566d-43b7-acd9-4f0b5db08974">稀土路街道办事处</option>
+                            <option value="6e922367-f21f-4daf-b38c-c55a67d9a35b">民馨路街道办事处</option>
+                            <option value="8d62a0cc-2c15-4355-906c-6720f8f3617e">万水泉镇</option>
+                        </select>
+                    </div>
+                </div>
                 <div class="layui-form-item">
                     <label class="layui-form-label">自治区</label>
                     <div class="layui-input-block layui-form" id="areaSelectTemplateBox" lay-filter="areaSelectTemplateBox"></div>
@@ -807,6 +818,7 @@
                 var loadLayerIndex;
                 formData.field['introduction'] = wangEditorObj['introduction'].txt.html();
                 formData.field['remake'] = wangEditorObj['remake'].txt.html();
+                formData.field.belongStreetName = $('#belongStreet').find('option:selected').text();
                 top.restAjax.put(top.restAjax.path('api/partyorganize/updatepartyorganize/{partyOrganizeId}', [partyOrganizeId]), formData.field, null, function(code, data) {
                     var layerIndex = top.dialog.msg(top.dataMessage.updateSuccess, {
                         time: 0,