修改 活动反馈修改

src/main/java/platform/modules/api/web/ActivityOpenController.java

@@ -361,6 +361,8 @@ public class ActivityOpenController extends BaseController {
     @OperationLog(value = "新增反馈")
     @PostMapping(value = "/feedback")
     public ResponseMessage feedbackSave(@RequestBody ActivityFeedback activityFeedback) {
+        activityFeedback.setIs_view(false);
+        activityFeedback.setIs_top(false);
         return ResponseMessage.success("操作成功!", activityFeedbackService.feedbackSave(activityFeedback));
     }
 

src/main/java/platform/modules/company/dao/StockLandDao.java

@@ -36,7 +36,7 @@ public interface StockLandDao extends BaseMapper<StockLand>{
 			@Param("approve")String approve,@Param("userData")UserData userData,
 			@Param("stockLandId")Integer stockLandId,@Param("approvedId")Integer approvedId
 			,@Param("itemId")Integer itemId,@Param("street_id") Integer street_id,@Param("applyUserType") Integer applyUserType,@Param("statusList") List<String> statusList);
-	
+
 	List<StockLand> findSelectPage(@Param("stockLandId")Integer stockLandId,@Param("approvedId")Integer approvedId,
 			@Param("itemId")Integer itemId,@Param("street_id") Integer street_id,@Param("keyword")String keyword,
 			@Param("company_name") String company_name,@Param("approve_status")String approve_status,
@@ -50,4 +50,6 @@ public interface StockLandDao extends BaseMapper<StockLand>{
 	List<GovStatisticsDto> getStreetHandleCompare(@Param("condition") SearchCondition searchCondition);
 
     List<StockLand> findListByCondition(@Param("condition") SearchCondition searchCondition);
+
+	List<StockLand> findListByStreetId(@Param("street_id") String street_id,@Param("apply_user_type") Integer applyUserType);
 }

src/main/java/platform/modules/government/service/LandStatisticsService.java

@@ -0,0 +1,64 @@
+package platform.modules.government.service;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import platform.common.Constant;
+import platform.common.base.service.BaseService;
+import platform.modules.company.dao.StockLandDao;
+import platform.modules.company.entity.StockLand;
+import platform.modules.government.entity.*;
+
+import java.util.*;
+
+/**
+ * 用地统计service
+ */
+@Service
+@Transactional
+public class LandStatisticsService {
+
+    @Autowired
+    private StockLandDao stockLandDao;
+
+    public Object getApproveStatusStatistics(String streetId) {
+
+        List<StockLand> stockLandList = stockLandDao.findListByStreetId(streetId, null);
+
+        //创建待处理，处理中，已处理
+        List<Map> pending = new ArrayList<>(), processing = new ArrayList<>(), processed = new ArrayList<>();
+        //创建待处理具体
+        Integer pendingCompany = 0, pendingStreet = 0;
+        //创建处理中具体
+        //Integer pendingCompany = 0, pendingStreet = 0;
+        //创建已处理具体
+        Integer processedPassed = 0, processedReject = 0, processedNotPass = 0;
+
+        for (StockLand stockLand : stockLandList) {
+
+            if(Objects.equals(Constant.UserType.STREET,stockLand.getApplyUserType())){
+                pendingStreet++;
+            }else if(Objects.equals(Constant.UserType.COMPANY,stockLand.getApplyUserType())){
+                pendingCompany++;
+            }
+        }
+
+        //装配待处理具体
+        Map<String,Object> temp = new HashMap<>();
+        temp.put("name", "企业申请");
+        temp.put("value", pendingCompany);
+        pending.add(temp);
+        temp = new HashMap<>();
+        temp.put("name", "街道代理");
+        temp.put("value", pendingStreet);
+        pending.add(temp);
+
+        //最后装配一起返回
+        Map<String, List> map = new HashMap<>();
+        map.put("pending", pending);
+        map.put("processing", processing);
+        map.put("processed", processed);
+        return map;
+    }
+
+}

src/main/java/platform/modules/government/web/LandStatisticController.java

@@ -0,0 +1,27 @@
+package platform.modules.government.web;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+import platform.common.base.controller.BaseController;
+import platform.modules.government.service.LandStatisticsService;
+import platform.modules.sys.web.ResponseMessage;
+
+
+/**
+ * 用地统计Controller
+ */
+@RestController
+@RequestMapping("/land_statistic")
+public class LandStatisticController extends BaseController {
+
+    @Autowired
+    private LandStatisticsService landStatisticsService;
+
+    @GetMapping("/approve/status")
+    public ResponseMessage approveStatus(@RequestParam(value = "street_id",defaultValue = "",required = false) String streetId) {
+
+        Object o = landStatisticsService.getApproveStatusStatistics(streetId);
+        return ResponseMessage.success("获取数据成功", o);
+    }
+}

src/main/java/platform/modules/sys/dao/ActivityRegistrationDao.java

@@ -27,7 +27,7 @@ public interface ActivityRegistrationDao extends BaseMapper<ActivityRegistration
 
     List<ActivityRegistration> findByRelationIdAndType(@Param("type") String type, @Param("rel") String id, @Param("activity_id") String activity_id);
 
-    List<ActivityRegistration> findByActivityAndUserId(@Param("activity_id") String activity_id, @Param("user_id") String user_id);
+    List<ActivityRegistration> findByActivityAndPhone(@Param("activity_id") String activity_id, @Param("phone") String phone);
 
     List<ActivityRegistration> findByActivityIdAndUserIdAndPhones(@Param("activity_id") String activity_id,@Param("user_id") String user_id, @Param("registrations") List<ActivityRegistration> registrations);
 

src/main/java/platform/modules/sys/service/ActivityFeedbackService.java

@@ -2,11 +2,9 @@ package platform.modules.sys.service;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.RequestParam;
 import platform.common.base.service.BaseService;
 import platform.common.util.ShiroUtils;
 import platform.modules.government.dto.FeedbackQuery;
@@ -177,14 +175,15 @@ public class ActivityFeedbackService extends BaseService<ActivityFeedback> {
      * @Date: 2020/1/7
      * @Params: [activityId, userId]
      * @Return: platform.modules.sys.entity.ActivityFeedback
-     **/
+     *
+     * @return*/
     @Transactional(readOnly = true)
-    public ActivityFeedback feedbackGet(String activityId, String userId) {
+    public List<ActivityFeedback> feedbackGet(String activityId, String userId) {
 
         ActivityFeedback activityFeedback = new ActivityFeedback();
         activityFeedback.setActivity_id(activityId);
         activityFeedback.setUser_id(userId);
-        return this.findOne(activityFeedback);
+        return this.findListByWhere(activityFeedback);
     }
 
     /**

src/main/java/platform/modules/sys/service/ActivityRegistrationService.java

@@ -286,7 +286,7 @@ public class ActivityRegistrationService extends BaseService<ActivityRegistratio
      *
      * @return
      */
-    public List<ActivityRegistration> getCurrRegUsers(String activity_id, String user_id) {
+    public List<ActivityRegistration> getCurrRegUsers(String activity_id, String phone) {
 
         /*User user = userService.findByMobile(phone);
         if (user == null)
@@ -306,7 +306,7 @@ public class ActivityRegistrationService extends BaseService<ActivityRegistratio
         } else if (Objects.equals(Constant.UserType.WECHAT, userType)) {
             relationId = user.getId().toString();
         }*/
-        return activityRegistrationDao.findByActivityAndUserId(activity_id, user_id);
+        return activityRegistrationDao.findByActivityAndPhone(activity_id, phone);
     }
 
     /**

src/main/resources/application.yml

@@ -129,18 +129,18 @@ pagehelper:
 
 
 #测试小程序
-##app_id
-#app_id: wx3007d6086b29908c
-#
-##app_sercet
-#app_sercet: 68245dbd037f7516bcbe0eeafc1e01a9
-
-# 正式小程序
 #app_id
-app_id: wx27a06edbe6042585
+app_id: wx3007d6086b29908c
 
 #app_sercet
-app_sercet: 10a09d22fb48ba84f892bbde056dac06
+app_sercet: 68245dbd037f7516bcbe0eeafc1e01a9
+
+# 正式小程序
+##app_id
+#app_id: wx27a06edbe6042585
+#
+##app_sercet
+#app_sercet: 10a09d22fb48ba84f892bbde056dac06
 
 activity_page_path_detail: pages/activity/activityDetail/main
 

src/main/resources/mapper/company/StockLandDao.xml

@@ -38,7 +38,7 @@
 				or
 				nextChecker LIKE CONCAT(CONCAT('%,',#{condition.userId}), ',%')
 			)
-			
+
 			and g.create_time in (select max(CREATE_TIME)from z_approval where del_flag=0 group by APPLY_ID )
 		and a.approve_status in
 			<foreach collection="condition.apply_status" index="index" item="item" open="(" separator="," close=")">
@@ -139,9 +139,9 @@
 				)
 			)
 		</if>
-		
+
 		order by create_time desc
-		
+
 	</select>
 
 
@@ -171,7 +171,7 @@
 			approve_status_name,
 			overTime,
 			update_time
-			
+
 		from (
 		SELECT
 			a.id,
@@ -216,14 +216,14 @@
 					)
 				</if>
 			)
-			
+
 			<if test="condition.applyUserType!=null and condition.applyUserType!=''">
 				and zUser.user_type = #{condition.applyUserType}
 			</if>
-			
+
 			and g.del_flag = 0
 			)q
-			WHERE 1=1 
+			WHERE 1=1
 		<if test="condition.approve_status != null and condition.approve_status!=''">
 			and q.approve_status=#{condition.approve_status}
 		</if>
@@ -275,10 +275,10 @@
 		LEFT JOIN z_user zUser on zUser.id = a.create_by
 		WHERE
 		a.del_flag = '0'
-		AND 
+		AND
 			type.id = #{stockLandId} and type2.id=#{approvedId}
 		AND
-			a.approve_status in 
+			a.approve_status in
 			<foreach collection="statusList" index="index" item="item" open="(" separator="," close=")">
 				#{item}
 			</foreach>
@@ -306,13 +306,13 @@
 					(
 						select temp.maxTime from (select APPLY_ID,max(CREATE_TIME) maxTime
 						from z_approval
-						
+
 						GROUP BY APPLY_ID
 						) temp	)
 				)
 order by a.create_time desc
 	</select>
-	
+
 	<!-- 查询所有审核状态下的列表 -->
 	<select id="findSelectPage" resultType="platform.modules.company.entity.StockLand">
 		SELECT DISTINCT
@@ -437,4 +437,28 @@ order by a.create_time desc
 			<![CDATA[ and DATE_FORMAT(sla.create_time, '%Y-%m-%d')<=  DATE_FORMAT(#{condition.end_date}, '%Y-%m-%d')   ]]>
 		</if>
 	</select>
+
+
+	<!-- 审核通过的列表 -->
+	<select id="findListByStreetId" resultType="platform.modules.company.entity.StockLand">
+		SELECT
+			stockland.street_id,
+			stockland.apply_type,
+			stockland.apply_status,
+			stockland.approve_status,
+			stockland.process_status,
+			zuser.user_type AS applyUserType
+		FROM
+			c_stock_land_apply stockland
+		LEFT JOIN
+			z_user zuser ON zuser.id = stockland.create_by
+		WHERE
+			stockland.del_flag = '0'
+		<if test="street_id != null and street_id != ''">
+			AND stockland.street_id = #{street_id}
+		</if>
+		<if test="apply_user_type!=null and apply_user_type!=''">
+			AND zuser.user_type = #{apply_user_type}
+		</if>
+	</select>
 </mapper>

src/main/resources/mapper/sys/ActivityRegistrationDao.xml

@@ -315,7 +315,7 @@
         </foreach>
     </select>
 
-    <select id="findByActivityAndUserId"
+    <select id="findByActivityAndPhone"
             resultType="platform.modules.sys.entity.ActivityRegistration">
 
        SELECT
@@ -325,7 +325,7 @@
         WHERE
             reg.del_flag = 0
         and reg.activity_id = #{activity_id}
-        and reg.user_id = #{user_id}
+        and reg.phone = #{phone}
         ORDER BY
             reg.create_time ASC
     </select>