Merge remote-tracking branch 'origin/xinghong-dev'

java110-bean/src/main/java/com/java110/dto/attendanceClasses/AttendanceClassesDto.java

@@ -23,6 +23,7 @@ public class AttendanceClassesDto extends PageDto implements Serializable {
     private String classesObjType;
     private String storeId;
     private String clockType;
+    private String clockTypeName;
     private String classesObjId;
     private String classesName;
     private String classesId;
@@ -32,12 +33,10 @@ public class AttendanceClassesDto extends PageDto implements Serializable {
     private String classesObjName;
     private List<AttendanceClassesAttrDto> attrs;
 
-
     private Date createTime;
 
     private String statusCd = "0";
 
-
     public String getTimeOffset() {
         return timeOffset;
     }
@@ -126,7 +125,6 @@ public class AttendanceClassesDto extends PageDto implements Serializable {
         this.clockTypeValue = clockTypeValue;
     }
 
-
     public Date getCreateTime() {
         return createTime;
     }
@@ -158,4 +156,12 @@ public class AttendanceClassesDto extends PageDto implements Serializable {
     public void setAttrs(List<AttendanceClassesAttrDto> attrs) {
         this.attrs = attrs;
     }
+
+    public String getClockTypeName() {
+        return clockTypeName;
+    }
+
+    public void setClockTypeName(String clockTypeName) {
+        this.clockTypeName = clockTypeName;
+    }
 }

java110-bean/src/main/java/com/java110/dto/notice/NoticeDto.java

@@ -41,14 +41,12 @@ public class NoticeDto extends PageDto implements Serializable {
     private String state;
     private String stateName;
 
-
     private Date createTime;
 
     private String noticeTypeCdName;
 
     private String statusCd = "0";
 
-
     public String getNoticeTypeCd() {
         return noticeTypeCd;
     }

java110-bean/src/main/java/com/java110/dto/questionAnswer/QuestionAnswerDto.java

@@ -18,8 +18,6 @@ public class QuestionAnswerDto extends PageDto implements Serializable {
     public static final String QA_TYPE_COMMUNITY = "3306";//小区
     public static final String QA_TYPE_STORE = "3307";//商户ID
 
-
-
     private String qaName;
     private String qaType;
     private String qaTypeName;
@@ -31,13 +29,12 @@ public class QuestionAnswerDto extends PageDto implements Serializable {
     private String[] objIds;
     private String qaId;
     private String userId;
-
+    private String remark;
 
     private Date createTime;
 
     private String statusCd = "0";
 
-
     public String getQaName() {
         return qaName;
     }
@@ -102,7 +99,6 @@ public class QuestionAnswerDto extends PageDto implements Serializable {
         this.qaId = qaId;
     }
 
-
     public Date getCreateTime() {
         return createTime;
     }
@@ -142,4 +138,12 @@ public class QuestionAnswerDto extends PageDto implements Serializable {
     public void setUserId(String userId) {
         this.userId = userId;
     }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
 }

java110-bean/src/main/java/com/java110/dto/visit/VisitDto.java

@@ -28,7 +28,7 @@ public class VisitDto extends PageDto implements Serializable {
     private String bId;
     private String visitStartTime;
     private String visitEndTime;
-
+    private String statusCd = "0";
 
     public String getvName() {
         return vName;
@@ -134,4 +134,12 @@ public class VisitDto extends PageDto implements Serializable {
     public void setVisitEndTime(String visitEndTime) {
         this.visitEndTime = visitEndTime;
     }
+
+    public String getStatusCd() {
+        return statusCd;
+    }
+
+    public void setStatusCd(String statusCd) {
+        this.statusCd = statusCd;
+    }
 }

java110-bean/src/main/java/com/java110/po/owner/VisitPo.java

@@ -21,6 +21,7 @@ public class VisitPo implements Serializable {
     private String visitCase;
     private String visitTime;
     private String departureTime;
+    private String statusCd;
 
     public String getvId() {
         return vId;
@@ -101,4 +102,12 @@ public class VisitPo implements Serializable {
     public void setDepartureTime(String departureTime) {
         this.departureTime = departureTime;
     }
+
+    public String getStatusCd() {
+        return statusCd;
+    }
+
+    public void setStatusCd(String statusCd) {
+        this.statusCd = statusCd;
+    }
 }

java110-bean/src/main/java/com/java110/po/questionAnswer/QuestionAnswerPo.java

@@ -13,6 +13,7 @@ public class QuestionAnswerPo implements Serializable {
     private String objType;
     private String objId;
     private String qaId;
+    private String remark;
 
     public String getQaName() {
         return qaName;
@@ -86,5 +87,11 @@ public class QuestionAnswerPo implements Serializable {
         this.qaId = qaId;
     }
 
+    public String getRemark() {
+        return remark;
+    }
 
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
 }

java110-bean/src/main/java/com/java110/po/questionAnswerTitleValue/QuestionAnswerTitleValuePo.java

@@ -6,55 +6,68 @@ import java.util.Date;
 public class QuestionAnswerTitleValuePo implements Serializable {
 
     private String valueId;
-private String titleId;
-private String objId;
-private String statusCd = "0";
-private String objType;
-private String qaValue;
-private String seq;
-public String getValueId() {
+    private String titleId;
+    private String objId;
+    private String statusCd = "0";
+    private String objType;
+    private String qaValue;
+    private String seq;
+
+    public String getValueId() {
         return valueId;
     }
-public void setValueId(String valueId) {
+
+    public void setValueId(String valueId) {
         this.valueId = valueId;
     }
-public String getTitleId() {
+
+    public String getTitleId() {
         return titleId;
     }
-public void setTitleId(String titleId) {
+
+    public void setTitleId(String titleId) {
         this.titleId = titleId;
     }
-public String getObjId() {
+
+    public String getObjId() {
         return objId;
     }
-public void setObjId(String objId) {
+
+    public void setObjId(String objId) {
         this.objId = objId;
     }
-public String getStatusCd() {
+
+    public String getStatusCd() {
         return statusCd;
     }
-public void setStatusCd(String statusCd) {
+
+    public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
-public String getObjType() {
+
+    public String getObjType() {
         return objType;
     }
-public void setObjType(String objType) {
+
+    public void setObjType(String objType) {
         this.objType = objType;
     }
-public String getQaValue() {
+
+    public String getQaValue() {
         return qaValue;
     }
-public void setQaValue(String qaValue) {
+
+    public void setQaValue(String qaValue) {
         this.qaValue = qaValue;
     }
-public String getSeq() {
+
+    public String getSeq() {
         return seq;
     }
-public void setSeq(String seq) {
+
+    public void setSeq(String seq) {
         this.seq = seq;
     }
 
 
-
 }

java110-db/src/main/resources/mapper/common/AttendanceClassesServiceDaoImplMapper.xml

@@ -1,21 +1,18 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="attendanceClassesServiceDaoImpl">
 
     <!-- 保存考勤班次信息 add by wuxw 2018-07-03 -->
     <insert id="saveBusinessAttendanceClassesInfo" parameterType="Map">
-        insert into business_attendance_classes(
-        time_offset,clock_count,classes_obj_type,store_id,clock_type,classes_obj_id,classes_name,classes_id,operate,
-        leave_offset,late_offset,b_id,clock_type_value,classes_obj_name
-        ) values (
-        #{timeOffset},#{clockCount},#{classesObjType},#{storeId},#{clockType},#{classesObjId},#{classesName},#{classesId},#{operate},
-        #{leaveOffset},#{lateOffset},#{bId},#{clockTypeValue},#{classesObjName}
-        )
+        insert into business_attendance_classes(time_offset, clock_count, classes_obj_type, store_id, clock_type,
+                                                classes_obj_id, classes_name, classes_id, operate,
+                                                leave_offset, late_offset, b_id, clock_type_value, classes_obj_name)
+        values (#{timeOffset}, #{clockCount}, #{classesObjType}, #{storeId}, #{clockType}, #{classesObjId},
+                #{classesName}, #{classesId}, #{operate},
+                #{leaveOffset}, #{lateOffset}, #{bId}, #{clockTypeValue}, #{classesObjName})
     </insert>
 
-
     <!-- 查询考勤班次信息（Business） add by wuxw 2018-07-03 -->
     <select id="getBusinessAttendanceClassesInfo" parameterType="Map" resultType="Map">
         select t.time_offset,t.time_offset timeOffset,t.clock_count,t.clock_count
@@ -66,10 +63,8 @@
         <if test="clockTypeValue !=null and clockTypeValue != ''">
             and t.clock_type_value= #{clockTypeValue}
         </if>
-
     </select>
 
-
     <!-- 保存考勤班次信息至 instance表中 add by wuxw 2018-07-03 -->
     <insert id="saveAttendanceClassesInfoInstance" parameterType="Map">
         insert into attendance_classes(
@@ -116,10 +111,8 @@
         <if test="clockTypeValue !=null and clockTypeValue != ''">
             and t.clock_type_value= #{clockTypeValue}
         </if>
-
     </insert>
 
-
     <!-- 查询考勤班次信息 add by wuxw 2018-07-03 -->
     <select id="getAttendanceClassesInfo" parameterType="Map" resultType="Map">
         select t.time_offset,t.time_offset timeOffset,t.status_cd,t.status_cd statusCd,t.clock_count,t.clock_count
@@ -128,9 +121,11 @@
         classesObjId,t.classes_name,t.classes_name classesName,t.classes_id,t.classes_id
         classesId,t.leave_offset,t.leave_offset leaveOffset,t.late_offset,t.late_offset lateOffset,t.b_id,t.b_id
         bId,t.clock_type_value,t.clock_type_value clockTypeValue,
-        t.classes_obj_name,t.classes_obj_name classesObjName
+        t.classes_obj_name,t.classes_obj_name classesObjName,td.name clockTypeName
         from attendance_classes t
-        where 1 =1
+        left join t_dict td on t.clock_type = td.status_cd and td.table_name = 'attendance_classes'
+        and td.table_columns = 'clock_type'
+        where 1 = 1
         <if test="timeOffset !=null and timeOffset != ''">
             and t.time_offset= #{timeOffset}
         </if>
@@ -174,10 +169,8 @@
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
         </if>
-
     </select>
 
-
     <!-- 修改考勤班次信息 add by wuxw 2018-07-03 -->
     <update id="updateAttendanceClassesInfoInstance" parameterType="Map">
         update attendance_classes t set t.status_cd = #{statusCd}
@@ -221,7 +214,6 @@
         <if test="bId !=null and bId != ''">
             and t.b_id= #{bId}
         </if>
-
     </update>
 
     <!-- 查询考勤班次数量 add by wuxw 2018-07-03 -->
@@ -268,8 +260,6 @@
         <if test="clockTypeValue !=null and clockTypeValue != ''">
             and t.clock_type_value= #{clockTypeValue}
         </if>
-
-
     </select>
 
 </mapper>

java110-db/src/main/resources/mapper/community/ActivitiesServiceDaoImplMapper.xml

@@ -1,20 +1,18 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="activitiesServiceDaoImpl">
 
     <!-- 保存活动信息 add by wuxw 2018-07-03 -->
     <insert id="saveBusinessActivitiesInfo" parameterType="Map">
-        insert into business_activities(
-        collect_count,like_count,title,read_count,user_name,user_id,activities_id,operate,type_cd,context,start_time,end_time,community_id,b_id,header_img,state
-        ) values (
-        #{collectCount},#{likeCount},#{title},#{readCount},#{userName},#{userId},#{activitiesId},#{operate},#{typeCd},#{context},#{startTime},#{endTime},
-        #{communityId},#{bId},#{headerImg},#{state}
-        )
+        insert into business_activities(collect_count, like_count, title, read_count, user_name, user_id, activities_id,
+                                        operate, type_cd, context, start_time, end_time, community_id, b_id, header_img,
+                                        state)
+        values (#{collectCount}, #{likeCount}, #{title}, #{readCount}, #{userName}, #{userId}, #{activitiesId},
+                #{operate}, #{typeCd}, #{context}, #{startTime}, #{endTime},
+                #{communityId}, #{bId}, #{headerImg}, #{state})
     </insert>
 
-
     <!-- 查询活动信息（Business） add by wuxw 2018-07-03 -->
     <select id="getBusinessActivitiesInfo" parameterType="Map" resultType="Map">
         select t.collect_count,t.collect_count collectCount,t.like_count,t.like_count
@@ -72,10 +70,8 @@
         <if test="state !=null and state != ''">
             and t.state= #{state}
         </if>
-
     </select>
 
-
     <!-- 保存活动信息至 instance表中 add by wuxw 2018-07-03 -->
     <insert id="saveActivitiesInfoInstance" parameterType="Map">
         insert into activities(
@@ -128,17 +124,16 @@
         <if test="headerImg !=null and headerImg != ''">
             and t.header_img= #{headerImg}
         </if>
-
     </insert>
 
-
     <!-- 查询活动信息 add by wuxw 2018-07-03 -->
     <select id="getActivitiesInfo" parameterType="Map" resultType="Map">
         select t.collect_count,t.collect_count collectCount,t.like_count,t.like_count likeCount,t.status_cd,t.status_cd
         statusCd,t.title,t.read_count,t.read_count readCount,t.user_name,t.user_name userName,t.user_id,t.user_id
         userId,t.activities_id,t.activities_id activitiesId,t.type_cd,t.type_cd
         typeCd,t.context,t.start_time,t.start_time startTime,t.end_time,t.end_time endTime,t.community_id,t.community_id
-        communityId,t.b_id,t.b_id bId,t.header_img,t.header_img headerImg,t.state,act.type_name typeCdName,t.create_time createTime
+        communityId,t.b_id,t.b_id bId,t.header_img,t.header_img headerImg,t.state,act.type_name typeCdName,t.create_time
+        createTime
         from activities t
         left join activities_type act on t.type_cd = act.type_cd and t.community_id = act.community_id
         where 1 =1
@@ -150,7 +145,7 @@
             and t.like_count= #{likeCount}
         </if>
         <if test="title !=null and title != ''">
-            and t.title= #{title}
+            and t.title like '%${title}%'
         </if>
         <if test="readCount !=null and readCount != ''">
             and t.read_count= #{readCount}
@@ -190,10 +185,8 @@
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
         </if>
-
     </select>
 
-
     <!-- 修改活动信息 add by wuxw 2018-07-03 -->
     <update id="updateActivitiesInfoInstance" parameterType="Map">
         update activities t set t.status_cd = #{statusCd}
@@ -246,7 +239,6 @@
         <if test="bId !=null and bId != ''">
             and t.b_id= #{bId}
         </if>
-
     </update>
 
     <!-- 查询活动数量 add by wuxw 2018-07-03 -->
@@ -261,9 +253,8 @@
         <if test="likeCount !=null and likeCount != ''">
             and t.like_count= #{likeCount}
         </if>
-
         <if test="title !=null and title != ''">
-            and t.title= #{title}
+            and t.title like '%${title}%'
         </if>
         <if test="readCount !=null and readCount != ''">
             and t.read_count= #{readCount}
@@ -298,8 +289,5 @@
         <if test="state !=null and state != ''">
             and t.state= #{state}
         </if>
-
-
     </select>
-
 </mapper>

java110-db/src/main/resources/mapper/community/NoticeServiceDaoImplMapper.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="noticeServiceDaoImpl">
 
@@ -14,7 +13,6 @@
         )
     </insert>
 
-
     <!-- 查询通知信息（Business） add by wuxw 2018-07-03 -->
     <select id="getBusinessNoticeInfo" parameterType="Map" resultType="Map">
         select t.operate,t.notice_type_cd,t.notice_type_cd noticeTypeCd,t.context,t.start_time,t.end_time,t.start_time
@@ -52,11 +50,8 @@
         <if test="noticeId !=null and noticeId != ''">
             and t.notice_id= #{noticeId}
         </if>
-
-
     </select>
 
-
     <!-- 保存通知信息至 instance表中 add by wuxw 2018-07-03 -->
     <insert id="saveNoticeInfoInstance" parameterType="Map">
         insert into n_notice(
@@ -93,10 +88,8 @@
         <if test="noticeId !=null and noticeId != ''">
             and t.notice_id= #{noticeId}
         </if>
-
     </insert>
 
-
     <!-- 查询通知信息 add by wuxw 2018-07-03 -->
     <select id="getNoticeInfo" parameterType="Map" resultType="Map">
         select t.notice_type_cd,t.notice_type_cd noticeTypeCd,t.context,t.start_time,t.start_time
@@ -115,10 +108,10 @@
             and t.context= #{context}
         </if>
         <if test="startTime !=null">
-            and t.start_time &lt;= #{startTime}
+            and t.start_time &gt;= #{startTime}
         </if>
         <if test="endTime !=null">
-            and t.end_time &gt;= #{endTime}
+            and t.end_time &lt;= #{endTime}
         </if>
         <if test="statusCd !=null and statusCd != ''">
             and t.status_cd= #{statusCd}
@@ -145,10 +138,8 @@
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
         </if>
-
     </select>
 
-
     <!-- 修改通知信息 add by wuxw 2018-07-03 -->
     <update id="updateNoticeInfoInstance" parameterType="Map">
         update n_notice t set t.status_cd = #{statusCd}
@@ -183,7 +174,6 @@
         <if test="noticeId !=null and noticeId != ''">
             and t.notice_id= #{noticeId}
         </if>
-
     </update>
 
     <!-- 查询通知数量 add by wuxw 2018-07-03 -->
@@ -198,10 +188,10 @@
             and t.context= #{context}
         </if>
         <if test="startTime !=null">
-            and t.start_time &lt;= #{startTime}
+            and t.start_time &gt;= #{startTime}
         </if>
         <if test="endTime !=null">
-            and t.end_time &gt;= #{endTime}
+            and t.end_time &lt;= #{endTime}
         </if>
         <if test="statusCd !=null and statusCd != ''">
             and t.status_cd= #{statusCd}

java110-db/src/main/resources/mapper/community/VisitServiceDaoImplMapper.xml

@@ -1,19 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="visitServiceDaoImpl">
 
     <!-- 保存访客信息信息 add by wuxw 2018-07-03 -->
     <insert id="saveBusinessVisitInfo" parameterType="Map">
-        insert into business_visit_info(
-        departure_time,v_name,visit_gender,owner_id,user_id,v_id,phone_number,operate,visit_case,community_id,b_id,visit_time
-        ) values (
-        #{departureTime},#{vName},#{visitGender},#{ownerId},#{userId},#{vId},#{phoneNumber},#{operate},#{visitCase},#{communityId},#{bId},#{visitTime}
-        )
+        insert into business_visit_info(departure_time, v_name, visit_gender, owner_id, user_id, v_id, phone_number,
+                                        operate, visit_case, community_id, b_id, visit_time)
+        values (#{departureTime}, #{vName}, #{visitGender}, #{ownerId}, #{userId}, #{vId}, #{phoneNumber}, #{operate},
+                #{visitCase}, #{communityId}, #{bId}, #{visitTime})
     </insert>
 
-
     <!-- 查询访客信息信息（Business） add by wuxw 2018-07-03 -->
     <select id="getBusinessVisitInfo" parameterType="Map" resultType="Map">
         select t.departure_time,t.departure_time departureTime,t.v_name,t.v_name vName,t.visit_gender,t.visit_gender
@@ -58,10 +55,8 @@
         <if test="bId !=null and bId != ''">
             and t.b_id= #{bId}
         </if>
-
     </select>
 
-
     <!-- 保存访客信息信息至 instance表中 add by wuxw 2018-07-03 -->
     <insert id="saveVisitInfoInstance" parameterType="Map">
         insert into s_visit_info(
@@ -103,10 +98,8 @@
         <if test="bId !=null and bId != ''">
             and t.b_id= #{bId}
         </if>
-
     </insert>
 
-
     <!-- 查询访客信息信息 add by wuxw 2018-07-03 -->
     <select id="getVisitInfo" parameterType="Map" resultType="Map">
         select t.departure_time,t.departure_time departureTime,t.v_name,t.v_name vName,t.status_cd,t.status_cd
@@ -163,7 +156,6 @@
         </if>
     </select>
 
-
     <!-- 修改访客信息信息 add by wuxw 2018-07-03 -->
     <update id="updateVisitInfoInstance" parameterType="Map">
         update s_visit_info t set t.status_cd = #{statusCd}
@@ -204,7 +196,6 @@
         <if test="bId !=null and bId != ''">
             and t.b_id= #{bId}
         </if>
-
     </update>
 
     <!-- 查询访客信息数量 add by wuxw 2018-07-03 -->
@@ -254,8 +245,6 @@
         <if test="visitEndTime !=null and visitEndTime !='' ">
             and t.visit_time &lt;= #{visitEndTime}
         </if>
-
-
     </select>
 
 </mapper>

java110-db/src/main/resources/mapper/user/QuestionAnswerServiceDaoImplMapper.xml

@@ -1,37 +1,32 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="questionAnswerServiceDaoImpl">
 
-
     <!-- 保存答卷信息 add by wuxw 2018-07-03 -->
     <insert id="saveQuestionAnswerInfo" parameterType="Map">
-        insert into question_answer(
-        qa_name,qa_type,start_time,end_time,remark,obj_type,obj_id,qa_id
-        ) values (
-        #{qaName},#{qaType},#{startTime},#{endTime},#{storeId},#{objType},#{objId},#{qaId}
-        )
+        insert into question_answer(qa_name, qa_type, start_time, end_time, remark, obj_type, obj_id, qa_id)
+        values (#{qaName}, #{qaType}, #{startTime}, #{endTime}, #{remark}, #{objType}, #{objId}, #{qaId})
     </insert>
 
-
     <!-- 查询答卷信息 add by wuxw 2018-07-03 -->
     <select id="getQuestionAnswerInfo" parameterType="Map" resultType="Map">
-
         select t.qa_name,t.qa_name qaName,t.qa_type,t.qa_type qaType,t.status_cd,t.status_cd
         statusCd,t.start_time,t.start_time startTime,t.end_time,t.end_time endTime,t.remark,
         t.obj_type,t.obj_type objType,t.obj_id,t.obj_id objId,t.qa_id,t.qa_id qaId,td.`name` qaTypeName
         <if test="userId !=null and userId != ''">
-        ,uqa.person_id userId
+            ,uqa.person_id userId
         </if>
         from question_answer t
-        LEFT JOIN t_dict td on td.status_cd = t.qa_type and td.table_name = 'question_answer' and td.table_columns = 'qa_type'
+        LEFT JOIN t_dict td on td.status_cd = t.qa_type and td.table_name = 'question_answer' and td.table_columns =
+        'qa_type'
         <if test="userId !=null and userId != ''">
-        LEFT JOIN user_question_answer uqa on t.qa_id = uqa.qa_id and uqa.status_cd = '0' and uqa.person_id = #{userId}
+            LEFT JOIN user_question_answer uqa on t.qa_id = uqa.qa_id and uqa.status_cd = '0' and uqa.person_id =
+            #{userId}
         </if>
         where 1 =1
         <if test="qaName !=null and qaName != ''">
-            and t.qa_name like  concat('%',#{qaName},'%')
+            and t.qa_name like concat('%',#{qaName},'%')
         </if>
         <if test="qaType !=null and qaType != ''">
             and t.qa_type= #{qaType}
@@ -67,10 +62,8 @@
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
         </if>
-
     </select>
 
-
     <!-- 修改答卷信息 add by wuxw 2018-07-03 -->
     <update id="updateQuestionAnswerInfo" parameterType="Map">
         update question_answer t set t.status_cd = #{statusCd}
@@ -89,8 +82,8 @@
         <if test="endTime !=null and endTime != ''">
             , t.end_time= #{endTime}
         </if>
-        <if test="storeId !=null and storeId != ''">
-            , t.remark= #{storeId}
+        <if test="remark !=null and remark != ''">
+            , t.remark= #{remark}
         </if>
         <if test="objType !=null and objType != ''">
             , t.obj_type= #{objType}
@@ -102,7 +95,6 @@
         <if test="qaId !=null and qaId != ''">
             and t.qa_id= #{qaId}
         </if>
-
     </update>
 
     <!-- 查询答卷数量 add by wuxw 2018-07-03 -->
@@ -111,7 +103,7 @@
         from question_answer t
         where 1 =1
         <if test="qaName !=null and qaName != ''">
-            and t.qa_name like  concat('%',#{qaName},'%')
+            and t.qa_name like concat('%',#{qaName},'%')
         </if>
         <if test="qaType !=null and qaType != ''">
             and t.qa_type= #{qaType}
@@ -125,8 +117,8 @@
         <if test="endTime !=null and endTime != ''">
             and t.end_time= #{endTime}
         </if>
-        <if test="storeId !=null and storeId != ''">
-            and t.remark= #{storeId}
+        <if test="remark !=null and remark != ''">
+            and t.remark= #{remark}
         </if>
         <if test="objType !=null and objType != ''">
             and t.obj_type= #{objType}
@@ -143,8 +135,6 @@
         <if test="qaId !=null and qaId != ''">
             and t.qa_id= #{qaId}
         </if>
-
-
     </select>
 
 </mapper>

service-acct/src/main/java/com/java110/acct/cmd/couponShopPool/ListCouponShopPoolCmd.java

@@ -17,21 +17,19 @@ package com.java110.acct.cmd.couponShopPool;
 
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
-import com.java110.core.annotation.Java110Transactional;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.AbstractServiceCmdListener;
 import com.java110.core.event.cmd.CmdEvent;
-import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.intf.acct.ICouponShopPoolV1InnerServiceSMO;
-import com.java110.po.couponShopPool.CouponShopPoolPo;
 import com.java110.utils.exception.CmdException;
-import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import com.java110.dto.couponShopPool.CouponShopPoolDto;
+
 import java.util.List;
 import java.util.ArrayList;
+
 import org.springframework.http.ResponseEntity;
 import org.springframework.http.HttpStatus;
 import org.slf4j.Logger;
@@ -51,7 +49,7 @@ import com.java110.core.log.LoggerFactory;
 @Java110Cmd(serviceCode = "couponShopPool.listCouponShopPool")
 public class ListCouponShopPoolCmd extends AbstractServiceCmdListener {
 
-  private static Logger logger = LoggerFactory.getLogger(ListCouponShopPoolCmd.class);
+    private static Logger logger = LoggerFactory.getLogger(ListCouponShopPoolCmd.class);
     @Autowired
     private ICouponShopPoolV1InnerServiceSMO couponShopPoolV1InnerServiceSMOImpl;
 
@@ -63,22 +61,22 @@ public class ListCouponShopPoolCmd extends AbstractServiceCmdListener {
     @Override
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
 
-           CouponShopPoolDto couponShopPoolDto = BeanConvertUtil.covertBean(reqJson, CouponShopPoolDto.class);
+        CouponShopPoolDto couponShopPoolDto = BeanConvertUtil.covertBean(reqJson, CouponShopPoolDto.class);
 
-           int count = couponShopPoolV1InnerServiceSMOImpl.queryCouponShopPoolsCount(couponShopPoolDto);
+        int count = couponShopPoolV1InnerServiceSMOImpl.queryCouponShopPoolsCount(couponShopPoolDto);
 
-           List<CouponShopPoolDto> couponShopPoolDtos = null;
+        List<CouponShopPoolDto> couponShopPoolDtos = null;
 
-           if (count > 0) {
-               couponShopPoolDtos = couponShopPoolV1InnerServiceSMOImpl.queryCouponShopPools(couponShopPoolDto);
-           } else {
-               couponShopPoolDtos = new ArrayList<>();
-           }
+        if (count > 0) {
+            couponShopPoolDtos = couponShopPoolV1InnerServiceSMOImpl.queryCouponShopPools(couponShopPoolDto);
+        } else {
+            couponShopPoolDtos = new ArrayList<>();
+        }
 
-           ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, couponShopPoolDtos);
+        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, couponShopPoolDtos);
 
-           ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
 
-           cmdDataFlowContext.setResponseEntity(responseEntity);
+        cmdDataFlowContext.setResponseEntity(responseEntity);
     }
 }

service-api/src/main/java/com/java110/api/aop/PageProcessAspect.java

@@ -179,7 +179,7 @@ public class PageProcessAspect {
             return o;
         } catch (Throwable e) {
             logger.error("执行方法异常", e);
-            return new ResponseEntity("内部异常" + e.getLocalizedMessage(), HttpStatus.BAD_REQUEST);
+            return new ResponseEntity(e.getLocalizedMessage(), HttpStatus.BAD_REQUEST);
         }
     }
 

service-api/src/main/java/com/java110/api/bmo/visit/impl/VisitBMOImpl.java

@@ -31,6 +31,7 @@ public class VisitBMOImpl extends ApiBaseBMO implements IVisitBMO {
     public void deleteVisit(JSONObject paramInJson, DataFlowContext dataFlowContext) {
 
         VisitPo visitPo = BeanConvertUtil.covertBean(paramInJson, VisitPo.class);
+        visitPo.setStatusCd("1");
         super.delete(dataFlowContext, visitPo, BusinessTypeConstant.BUSINESS_TYPE_DELETE_VISIT);
 
     }
@@ -59,8 +60,6 @@ public class VisitBMOImpl extends ApiBaseBMO implements IVisitBMO {
      * @return 订单服务能够接受的报文
      */
     public void updateVisit(JSONObject paramInJson, DataFlowContext dataFlowContext) {
-
-
         VisitPo visitPo = BeanConvertUtil.covertBean(paramInJson, VisitPo.class);
         super.update(dataFlowContext, visitPo, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_VISIT);
     }

service-api/src/main/java/com/java110/api/components/activities/ActivitiesManageComponent.java

@@ -1,13 +1,11 @@
 package com.java110.api.components.activities;
 
-
 import com.java110.core.context.IPageData;
 import com.java110.api.smo.common.ICommonGetSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
 
-
 /**
  * 活动组件管理类
  * <p>
@@ -31,6 +29,4 @@ public class ActivitiesManageComponent {
         pd.setApiUrl("activities.listActivitiess");
         return commonGetSMOImpl.doService(pd);
     }
-
-
 }

service-api/src/main/java/com/java110/api/components/notice/NoticeManageComponent.java

@@ -10,9 +10,9 @@ import org.springframework.stereotype.Component;
 
 /**
  * 公告组件管理类
- *
+ * <p>
  * add by wuxw
- *
+ * <p>
  * 2019-06-29
  */
 @Component("noticeManage")
@@ -23,10 +23,11 @@ public class NoticeManageComponent {
 
     /**
      * 查询公告列表
+     *
      * @param pd 页面数据封装
      * @return 返回 ResponseEntity 对象
      */
-    public ResponseEntity<String> list(IPageData pd){
+    public ResponseEntity<String> list(IPageData pd) {
         return listNoticesSMOImpl.listNotices(pd);
     }
 

service-api/src/main/java/com/java110/api/components/visit/DeleteVisitComponent.java

@@ -12,23 +12,24 @@ import org.springframework.stereotype.Component;
 @Component("deleteVisit")
 public class DeleteVisitComponent {
 
-@Autowired
-private IDeleteVisitSMO deleteVisitSMOImpl;
+    @Autowired
+    private IDeleteVisitSMO deleteVisitSMOImpl;
 
-/**
- * 添加访客登记数据
- * @param pd 页面数据封装
- * @return ResponseEntity 对象
- */
-public ResponseEntity<String> delete(IPageData pd){
+    /**
+     * 添加访客登记数据
+     *
+     * @param pd 页面数据封装
+     * @return ResponseEntity 对象
+     */
+    public ResponseEntity<String> delete(IPageData pd) {
         return deleteVisitSMOImpl.deleteVisit(pd);
     }
 
-public IDeleteVisitSMO getDeleteVisitSMOImpl() {
+    public IDeleteVisitSMO getDeleteVisitSMOImpl() {
         return deleteVisitSMOImpl;
     }
 
-public void setDeleteVisitSMOImpl(IDeleteVisitSMO deleteVisitSMOImpl) {
+    public void setDeleteVisitSMOImpl(IDeleteVisitSMO deleteVisitSMOImpl) {
         this.deleteVisitSMOImpl = deleteVisitSMOImpl;
     }
-            }
+}

service-api/src/main/java/com/java110/api/components/visit/EditVisitComponent.java

@@ -17,10 +17,11 @@ public class EditVisitComponent {
 
     /**
      * 添加小区数据
+     *
      * @param pd 页面数据封装
      * @return ResponseEntity 对象
      */
-    public ResponseEntity<String> update(IPageData pd){
+    public ResponseEntity<String> update(IPageData pd) {
         return editVisitSMOImpl.updateVisit(pd);
     }
 

service-api/src/main/java/com/java110/api/listener/activities/ListActivitiessListener.java

@@ -43,13 +43,11 @@ public class ListActivitiessListener extends AbstractServiceApiListener {
         return HttpMethod.GET;
     }
 
-
     @Override
     public int getOrder() {
         return DEFAULT_ORDER;
     }
 
-
     public IActivitiesInnerServiceSMO getActivitiesInnerServiceSMOImpl() {
         return activitiesInnerServiceSMOImpl;
     }
@@ -68,8 +66,8 @@ public class ListActivitiessListener extends AbstractServiceApiListener {
     protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
 
         ActivitiesDto activitiesDto = BeanConvertUtil.covertBean(reqJson, ActivitiesDto.class);
-        if(!StringUtil.isEmpty("clientType") && "H5".equals(reqJson.get("clientType"))){
-            Date day=new Date();
+        if (!StringUtil.isEmpty("clientType") && "H5".equals(reqJson.get("clientType"))) {
+            Date day = new Date();
             SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             activitiesDto.setStartTime(df.format(day));
             activitiesDto.setEndTime(df.format(day));
@@ -94,6 +92,5 @@ public class ListActivitiessListener extends AbstractServiceApiListener {
         ResponseEntity<String> responseEntity = new ResponseEntity<String>(JSONObject.toJSONString(apiActivitiesVo), HttpStatus.OK);
 
         context.setResponseEntity(responseEntity);
-
     }
 }

service-api/src/main/java/com/java110/api/listener/activities/SaveActivitiesListener.java

@@ -1,7 +1,6 @@
 package com.java110.api.listener.activities;
 
 import com.alibaba.fastjson.JSONObject;
-import com.java110.api.bmo.activities.IActivitiesBMO;
 import com.java110.api.listener.AbstractServiceApiPlusListener;
 import com.java110.core.annotation.Java110Listener;
 import com.java110.core.context.DataFlowContext;
@@ -43,9 +42,6 @@ public class SaveActivitiesListener extends AbstractServiceApiPlusListener {
     @Autowired
     private IFileInnerServiceSMO fileInnerServiceSMOImpl;
 
-    @Autowired
-    private IActivitiesBMO activitiesBMOImpl;
-
     @Autowired
     private IActivitiesTypeInnerServiceSMO activitiesTypeInnerServiceSMOImpl;
 
@@ -72,7 +68,6 @@ public class SaveActivitiesListener extends AbstractServiceApiPlusListener {
         Assert.hasKeyAndValue(reqJson, "endTime", "必填，请选择结束时间");
         Assert.hasKeyAndValue(reqJson, "userId", "必填，请填写用户ID");
         Assert.hasKeyAndValue(reqJson, "userName", "必填，请填写用户名称");
-
     }
 
     @Override
@@ -110,7 +105,6 @@ public class SaveActivitiesListener extends AbstractServiceApiPlusListener {
     }
 
     public List<ApiCommunityDataVo> getCommunitys(JSONObject reqJson) {
-
         //1.0 先查询 员工对应的部门
         OrgStaffRelDto orgStaffRelDto = new OrgStaffRelDto();
         orgStaffRelDto.setStoreId(reqJson.getString("storeId"));
@@ -168,7 +162,6 @@ public class SaveActivitiesListener extends AbstractServiceApiPlusListener {
             fileRelPo.setSaveWay("table");
             fileRelPo.setRelTypeCd("70000");
             super.insert(context, fileRelPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_FILE_REL);
-
         }
         ActivitiesPo activitiesPo = BeanConvertUtil.covertBean(reqJson, ActivitiesPo.class);
         activitiesPo.setReadCount("0");

service-api/src/main/java/com/java110/api/listener/visit/UpdateVisitListener.java

@@ -17,6 +17,7 @@ import org.springframework.http.HttpMethod;
  */
 @Java110Listener("updateVisitListener")
 public class UpdateVisitListener extends AbstractServiceApiPlusListener {
+
     @Autowired
     private IVisitBMO visitBMOImpl;
 
@@ -24,7 +25,7 @@ public class UpdateVisitListener extends AbstractServiceApiPlusListener {
     protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
 
         Assert.hasKeyAndValue(reqJson, "vId", "访客记录ID不能为空");
-        Assert.hasKeyAndValue(reqJson, "name", "必填，请填写访客姓名");
+        Assert.hasKeyAndValue(reqJson, "vName", "必填，请填写访客姓名");
         Assert.hasKeyAndValue(reqJson, "visitGender", "必填，请填写访客姓名");
         Assert.hasKeyAndValue(reqJson, "phoneNumber", "必填，请填写访客联系方式");
         Assert.hasKeyAndValue(reqJson, "visitTime", "必填，请填写访客拜访时间");

service-api/src/main/java/com/java110/api/smo/DefaultAbstractComponentSMO.java

@@ -565,16 +565,16 @@ public class DefaultAbstractComponentSMO extends AbstractComponentSMO {
 
         ResponseEntity<String> responseEntity = callCenterService(restTemplate, pd, JSONObject.toJSONString(param), url, HttpMethod.POST);
 
-        if (responseEntity.getStatusCode() != HttpStatus.OK) {
-            throw new SMOException("调用" + serviceCode + "失败，" + responseEntity.getBody());
-        }
-
         JSONObject resultVo = JSONObject.parseObject(responseEntity.getBody());
 
         if (ResultVo.CODE_MACHINE_OK != resultVo.getInteger("code")) {
             throw new SMOException(resultVo.getString("msg"));
         }
 
+        if (responseEntity.getStatusCode() != HttpStatus.OK) {
+            throw new SMOException(resultVo.getString("msg"));
+        }
+
         Object bObj = resultVo.get("data");
         JSONArray datas = null;
         if (bObj instanceof JSONObject) {

service-api/src/main/java/com/java110/api/smo/service/impl/EditServiceSMOImpl.java

@@ -30,16 +30,15 @@ public class EditServiceSMOImpl extends DefaultAbstractComponentSMO implements I
         //super.validatePageInfo(pd);
 
         Assert.hasKeyAndValue(paramIn, "serviceId", "服务ID不能为空");
-Assert.hasKeyAndValue(paramIn, "name", "必填，请填写服务名称");
-Assert.hasKeyAndValue(paramIn, "serviceCode", "必填，请填写服务编码如 service.saveService");
-Assert.hasKeyAndValue(paramIn, "businessTypeCd", "可填，请填写秘钥，如果填写了需要加密传输");
-Assert.hasKeyAndValue(paramIn, "seq", "必填，请填写序列");
-Assert.hasKeyAndValue(paramIn, "isInstance", "可填，请填写实例 Y 或N");
-Assert.hasKeyAndValue(paramIn, "method", "必填，请填写调用方式");
-Assert.hasKeyAndValue(paramIn, "timeout", "必填，请填写超时时间");
-Assert.hasKeyAndValue(paramIn, "retryCount", "必填，请填写重试次数");
-Assert.hasKeyAndValue(paramIn, "provideAppId", "必填，请填写提供服务");
-
+        Assert.hasKeyAndValue(paramIn, "name", "必填，请填写服务名称");
+        Assert.hasKeyAndValue(paramIn, "serviceCode", "必填，请填写服务编码如 service.saveService");
+        Assert.hasKeyAndValue(paramIn, "businessTypeCd", "可填，请填写秘钥，如果填写了需要加密传输");
+        Assert.hasKeyAndValue(paramIn, "seq", "必填，请填写序列");
+        Assert.hasKeyAndValue(paramIn, "isInstance", "可填，请填写实例 Y 或N");
+        Assert.hasKeyAndValue(paramIn, "method", "必填，请填写调用方式");
+        Assert.hasKeyAndValue(paramIn, "timeout", "必填，请填写超时时间");
+        Assert.hasKeyAndValue(paramIn, "retryCount", "必填，请填写重试次数");
+        Assert.hasKeyAndValue(paramIn, "provideAppId", "必填，请填写提供服务");
 
 
         super.checkUserHasPrivilege(pd, restTemplate, PrivilegeCodeConstant.AGENT_HAS_LIST_SERVICE);

service-api/src/main/java/com/java110/api/smo/visit/IEditVisitSMO.java

@@ -5,15 +5,17 @@ import org.springframework.http.ResponseEntity;
 
 /**
  * 修改访客登记接口
- *
+ * <p>
  * add by wuxw 2019-06-30
  */
 public interface IEditVisitSMO {
 
     /**
      * 修改小区
+     *
      * @param pd 页面数据封装
      * @return ResponseEntity 对象
      */
     ResponseEntity<String> updateVisit(IPageData pd);
+
 }

service-api/src/main/java/com/java110/api/smo/visit/impl/EditVisitSMOImpl.java

@@ -26,19 +26,14 @@ public class EditVisitSMOImpl extends DefaultAbstractComponentSMO implements IEd
 
     @Override
     protected void validate(IPageData pd, JSONObject paramIn) {
-
         //super.validatePageInfo(pd);
-
         Assert.hasKeyAndValue(paramIn, "vId", "访客记录ID不能为空");
-        Assert.hasKeyAndValue(paramIn, "name", "必填，请填写访客姓名");
-        Assert.hasKeyAndValue(paramIn, "visitGender", "必填，请填写访客姓名");
-        Assert.hasKeyAndValue(paramIn, "visitGender", "必填，请填写访客姓名");
+        Assert.hasKeyAndValue(paramIn, "vName", "必填，请填写访客姓名");
+        Assert.hasKeyAndValue(paramIn, "visitGender", "必填，请填写访客性别");
         Assert.hasKeyAndValue(paramIn, "phoneNumber", "必填，请填写访客联系方式");
-        Assert.hasKeyAndValue(paramIn, "visitTime", "必填，请填写访客拜访时间");
-
-
+        Assert.hasKeyAndValue(paramIn, "visitTime", "必填，请填写访客来访时间");
+        Assert.hasKeyAndValue(paramIn, "visitTime", "必填，请填写访客离开时间");
         super.checkUserHasPrivilege(pd, restTemplate, PrivilegeCodeConstant.AGENT_HAS_LIST_VISIT);
-
     }
 
     @Override

service-common/src/main/java/com/java110/common/api/WorkflowApi.java

@@ -7,18 +7,9 @@ import com.java110.common.bmo.workflow.IQueryWorkFlowFirstStaffBMO;
 import com.java110.dto.workflow.WorkflowDto;
 import com.java110.dto.workflow.WorkflowModelDto;
 import com.java110.utils.util.BeanConvertUtil;
-import com.java110.vo.ResultVo;
-import org.activiti.editor.constants.ModelDataJsonConstants;
 import org.activiti.engine.ActivitiException;
-import org.activiti.engine.ProcessEngine;
-import org.activiti.engine.ProcessEngines;
 import org.activiti.engine.RepositoryService;
-import org.activiti.engine.RuntimeService;
-import org.activiti.engine.repository.Deployment;
 import org.activiti.engine.repository.Model;
-import org.apache.batik.transcoder.TranscoderInput;
-import org.apache.batik.transcoder.TranscoderOutput;
-import org.apache.batik.transcoder.image.PNGTranscoder;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import com.java110.core.log.LoggerFactory;
@@ -33,13 +24,10 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-
 @RestController
 @RequestMapping("/workflow")
 public class WorkflowApi {
+
     private static final Logger logger = LoggerFactory.getLogger(WorkflowApi.class);
 
     @Autowired
@@ -48,15 +36,11 @@ public class WorkflowApi {
     @Autowired
     private ObjectMapper objectMapper;
 
-
-
     String MODEL_ID = "modelId";
     String MODEL_NAME = "name";
     String MODEL_REVISION = "revision";
     String MODEL_DESCRIPTION = "description";
 
-
-
     @Autowired
     private IQueryWorkFlowFirstStaffBMO queryWorkFlowFirstStaffBMOImpl;
 
@@ -71,7 +55,6 @@ public class WorkflowApi {
         return queryWorkFlowFirstStaffBMOImpl.query(workflowDto);
     }
 
-
     /**
      * 更新流程
      *
@@ -80,14 +63,11 @@ public class WorkflowApi {
      */
     @RequestMapping(value = "/saveModel", method = RequestMethod.POST)
     @ResponseStatus(value = HttpStatus.OK)
-    public ResponseEntity<String> saveModel(
-                                            @RequestBody String reqString) {
+    public ResponseEntity<String> saveModel(@RequestBody String reqString) {
         JSONObject reqJson = JSONObject.parseObject(reqString);
         WorkflowModelDto workflowModelDto = BeanConvertUtil.covertBean(reqJson, WorkflowModelDto.class);
-
         //部署model
         return queryWorkFlowFirstStaffBMOImpl.saveModel(workflowModelDto);
-
     }
 
     /**
@@ -98,14 +78,11 @@ public class WorkflowApi {
      */
     @RequestMapping(value = "/deployModel", method = RequestMethod.POST)
     @ResponseStatus(value = HttpStatus.OK)
-    public ResponseEntity<String> deployModel(
-            @RequestBody String reqString) {
+    public ResponseEntity<String> deployModel(@RequestBody String reqString) {
         JSONObject reqJson = JSONObject.parseObject(reqString);
         WorkflowModelDto workflowModelDto = BeanConvertUtil.covertBean(reqJson, WorkflowModelDto.class);
-
         //部署model
         return queryWorkFlowFirstStaffBMOImpl.deployModel(workflowModelDto);
-
     }
 
 
@@ -140,6 +117,4 @@ public class WorkflowApi {
         }
         return new ResponseEntity(modelNode.toString(), HttpStatus.OK);
     }
-
-
 }

service-oa/src/main/java/com/java110/oa/api/OaWorkflowApi.java

@@ -152,6 +152,8 @@ public class OaWorkflowApi {
     public ResponseEntity<String> queryOaWorkflow(@RequestHeader(value = "store-id") String storeId,
                                                   @RequestHeader(value = "user-id") String userId,
                                                   @RequestParam(value = "flowId", required = false) String flowId,
+                                                  @RequestParam(value = "flowName", required = false) String flowName,
+                                                  @RequestParam(value = "flowType", required = false) String flowType,
                                                   @RequestParam(value = "state", required = false) String state,
                                                   @RequestParam(value = "page") int page,
                                                   @RequestParam(value = "row") int row) {
@@ -160,6 +162,8 @@ public class OaWorkflowApi {
         oaWorkflowDto.setRow(row);
         oaWorkflowDto.setStoreId(storeId);
         oaWorkflowDto.setFlowId(flowId);
+        oaWorkflowDto.setFlowName(flowName);
+        oaWorkflowDto.setFlowType(flowType);
         oaWorkflowDto.setState(state);
         oaWorkflowDto.setUserId(userId);
         return getOaWorkflowBMOImpl.get(oaWorkflowDto);
@@ -381,11 +385,11 @@ public class OaWorkflowApi {
             if ("flowId".equals(key)) {
                 continue;
             }
-            if("fileName".equals(key)){
+            if ("fileName".equals(key)) {
                 continue;
             }
 
-            if("realFileName".equals(key)){
+            if ("realFileName".equals(key)) {
                 continue;
             }
 
@@ -467,11 +471,11 @@ public class OaWorkflowApi {
      */
     @RequestMapping(value = "/queryOaWorkflowUser", method = RequestMethod.GET)
     public ResponseEntity<String> queryOaWorkflowUser(@RequestHeader(value = "store-id") String storeId,
-                                                                     @RequestHeader(value = "user-id") String userId,
-                                                                     @RequestParam(value = "flowId", required = false) String flowId,
-                                                                     @RequestParam(value = "id", required = false) String id,
-                                                                     @RequestParam(value = "page") int page,
-                                                                     @RequestParam(value = "row") int row) {
+                                                      @RequestHeader(value = "user-id") String userId,
+                                                      @RequestParam(value = "flowId", required = false) String flowId,
+                                                      @RequestParam(value = "id", required = false) String id,
+                                                      @RequestParam(value = "page") int page,
+                                                      @RequestParam(value = "row") int row) {
         JSONObject paramIn = new JSONObject();
         paramIn.put("page", page);
         paramIn.put("row", row);

service-store/src/main/java/com/java110/store/api/PurchaseApi.java

@@ -255,13 +255,6 @@ public class PurchaseApi {
         //获取采购物品信息
         JSONArray resourceStores = reqJson.getJSONArray("resourceStores");
         List<PurchaseApplyDetailPo> purchaseApplyDetailPos = new ArrayList<>();
-        //查询当前小区的小区仓库
-        StorehouseDto storehouseDto = new StorehouseDto();
-        storehouseDto.setShObjId(reqJson.getString("communityId"));
-        storehouseDto.setShType(StorehouseDto.SH_TYPE_COMMUNITY);//小区仓库
-        //获取当前小区的小区仓库
-        List<StorehouseDto> storehouseDtos = storehouseInnerServiceSMOImpl.queryStorehouses(storehouseDto);
-        //Assert.listOnlyOne(storehouseDtos, "没有查询到当前小区仓库或查询出多个小区仓库！");
         for (int resourceStoreIndex = 0; resourceStoreIndex < resourceStores.size(); resourceStoreIndex++) {
             JSONObject resourceStore = resourceStores.getJSONObject(resourceStoreIndex);
             PurchaseApplyDetailPo purchaseApplyDetailPo = BeanConvertUtil.covertBean(resourceStore, PurchaseApplyDetailPo.class);
@@ -274,7 +267,7 @@ public class PurchaseApi {
             //查询当前小区仓库下该物品信息
             ResourceStoreDto resourceStoreDto = new ResourceStoreDto();
             resourceStoreDto.setResCode(resourceStore.getString("resCode"));
-            resourceStoreDto.setShId(storehouseDtos.get(0).getShId());
+            resourceStoreDto.setShId(resourceStore.getString("shzId"));//小区目标仓库
             List<ResourceStoreDto> resourceStoreDtos = resourceStoreInnerServiceSMOImpl.queryResourceStores(resourceStoreDto);
             //调整集团仓库物品信息
             ResourceStorePo resourceStorePo = new ResourceStorePo();
@@ -290,7 +283,7 @@ public class PurchaseApi {
                 allocationStorehouseDto.setAsId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_allocationStorehouseId));
                 allocationStorehouseDto.setbId("-1");
                 allocationStorehouseDto.setShIda(resourceStore.getString("shId"));
-                allocationStorehouseDto.setShIdz(storehouseDtos.get(0).getShId());
+                allocationStorehouseDto.setShIdz(resourceStore.getString("shzId"));//小区仓库
                 allocationStorehouseDto.setResId(resourceStoreDtos.get(0).getResId());
                 allocationStorehouseDto.setResName(resourceStoreDtos.get(0).getResName());
                 allocationStorehouseDto.setStoreId(storeId);
@@ -358,7 +351,7 @@ public class PurchaseApi {
                 allocationStorehouseDto.setAsId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_allocationStorehouseId));
                 allocationStorehouseDto.setbId("-1");
                 allocationStorehouseDto.setShIda(resourceStore.getString("shId"));
-                allocationStorehouseDto.setShIdz(storehouseDtos.get(0).getShId());
+                allocationStorehouseDto.setShIdz(resourceStore.getString("shzId"));//小区目标仓库
                 allocationStorehouseDto.setResId(resourceStore.getString("resId"));
                 allocationStorehouseDto.setResName(resourceStore.getString("resName"));
                 allocationStorehouseDto.setStoreId(storeId);
@@ -393,7 +386,7 @@ public class PurchaseApi {
                 List<ResourceStoreDto> resourceStoreDtoList = resourceStoreInnerServiceSMOImpl.queryResourceStores(resourceStoreDto2);
                 ResourceStoreDto resourceStoreDto1 = BeanConvertUtil.covertBean(resourceStoreDtoList.get(0), ResourceStoreDto.class);
                 resourceStoreDto1.setResId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_resId));
-                resourceStoreDto1.setShId(storehouseDtos.get(0).getShId());
+                resourceStoreDto1.setShId(resourceStore.getString("shzId"));
                 resourceStoreDto1.setbId("-1");
                 resourceStoreDto1.setStock(purchaseApplyDetailPo.getQuantity());
                 resourceStoreDto1.setCreateTime(new Date());

service-user/src/main/java/com/java110/user/api/QuestionAnswerApi.java

@@ -32,15 +32,16 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-
 @RestController
 @RequestMapping(value = "/questionAnswer")
 public class QuestionAnswerApi {
 
     @Autowired
     private ISaveQuestionAnswerBMO saveQuestionAnswerBMOImpl;
+
     @Autowired
     private IUpdateQuestionAnswerBMO updateQuestionAnswerBMOImpl;
+
     @Autowired
     private IDeleteQuestionAnswerBMO deleteQuestionAnswerBMOImpl;
 
@@ -49,8 +50,10 @@ public class QuestionAnswerApi {
 
     @Autowired
     private ISaveQuestionAnswerTitleBMO saveQuestionAnswerTitleBMOImpl;
+
     @Autowired
     private IUpdateQuestionAnswerTitleBMO updateQuestionAnswerTitleBMOImpl;
+
     @Autowired
     private IDeleteQuestionAnswerTitleBMO deleteQuestionAnswerTitleBMOImpl;
 
@@ -59,15 +62,16 @@ public class QuestionAnswerApi {
 
     @Autowired
     private ISaveQuestionAnswerTitleValueBMO saveQuestionAnswerTitleValueBMOImpl;
+
     @Autowired
     private IUpdateQuestionAnswerTitleValueBMO updateQuestionAnswerTitleValueBMOImpl;
+
     @Autowired
     private IDeleteQuestionAnswerTitleValueBMO deleteQuestionAnswerTitleValueBMOImpl;
 
     @Autowired
     private IGetQuestionAnswerTitleValueBMO getQuestionAnswerTitleValueBMOImpl;
 
-
     /**
      * 微信保存消息模板
      *
@@ -79,7 +83,6 @@ public class QuestionAnswerApi {
     @RequestMapping(value = "/saveQuestionAnswer", method = RequestMethod.POST)
     public ResponseEntity<String> saveQuestionAnswer(@RequestHeader(value = "store-id", required = false) String storeId,
                                                      @RequestBody JSONObject reqJson) {
-
         Assert.hasKeyAndValue(reqJson, "qaType", "请求报文中未包含qaType");
         Assert.hasKeyAndValue(reqJson, "qaName", "请求报文中未包含qaName");
         Assert.hasKeyAndValue(reqJson, "startTime", "请求报文中未包含startTime");
@@ -105,14 +108,11 @@ public class QuestionAnswerApi {
      */
     @RequestMapping(value = "/updateQuestionAnswer", method = RequestMethod.POST)
     public ResponseEntity<String> updateQuestionAnswer(@RequestBody JSONObject reqJson) {
-
         Assert.hasKeyAndValue(reqJson, "qaType", "请求报文中未包含qaType");
         Assert.hasKeyAndValue(reqJson, "qaName", "请求报文中未包含qaName");
         Assert.hasKeyAndValue(reqJson, "startTime", "请求报文中未包含startTime");
         Assert.hasKeyAndValue(reqJson, "endTime", "请求报文中未包含endTime");
         Assert.hasKeyAndValue(reqJson, "qaId", "qaId不能为空");
-
-
         QuestionAnswerPo questionAnswerPo = BeanConvertUtil.covertBean(reqJson, QuestionAnswerPo.class);
         return updateQuestionAnswerBMOImpl.update(questionAnswerPo);
     }
@@ -131,7 +131,6 @@ public class QuestionAnswerApi {
 
         Assert.hasKeyAndValue(reqJson, "qaId", "qaId不能为空");
 
-
         QuestionAnswerPo questionAnswerPo = BeanConvertUtil.covertBean(reqJson, QuestionAnswerPo.class);
         return deleteQuestionAnswerBMOImpl.delete(questionAnswerPo);
     }
@@ -197,8 +196,6 @@ public class QuestionAnswerApi {
                 throw new IllegalArgumentException("未包含选项");
             }
         }
-
-
         QuestionAnswerTitlePo questionAnswerTitlePo = BeanConvertUtil.covertBean(reqJson, QuestionAnswerTitlePo.class);
         return saveQuestionAnswerTitleBMOImpl.save(questionAnswerTitlePo, titleValues);
     }
@@ -213,7 +210,6 @@ public class QuestionAnswerApi {
      */
     @RequestMapping(value = "/updateQuestionAnswerTitle", method = RequestMethod.POST)
     public ResponseEntity<String> updateQuestionAnswerTitle(@RequestBody JSONObject reqJson) {
-
 //        Assert.hasKeyAndValue(reqJson, "qaId", "请求报文中未包含qaId");
         Assert.hasKeyAndValue(reqJson, "qaTitle", "请求报文中未包含qaTitle");
         Assert.hasKeyAndValue(reqJson, "titleType", "请求报文中未包含titleType");
@@ -228,7 +224,6 @@ public class QuestionAnswerApi {
                 throw new IllegalArgumentException("未包含选项");
             }
         }
-
         QuestionAnswerTitlePo questionAnswerTitlePo = BeanConvertUtil.covertBean(reqJson, QuestionAnswerTitlePo.class);
         return updateQuestionAnswerTitleBMOImpl.update(questionAnswerTitlePo, titleValues);
     }
@@ -247,7 +242,6 @@ public class QuestionAnswerApi {
 
         Assert.hasKeyAndValue(reqJson, "titleId", "titleId不能为空");
 
-
         QuestionAnswerTitlePo questionAnswerTitlePo = BeanConvertUtil.covertBean(reqJson, QuestionAnswerTitlePo.class);
         return deleteQuestionAnswerTitleBMOImpl.delete(questionAnswerTitlePo);
     }
@@ -262,7 +256,7 @@ public class QuestionAnswerApi {
      */
     @RequestMapping(value = "/queryQuestionAnswerTitle", method = RequestMethod.GET)
     public ResponseEntity<String> queryQuestionAnswerTitle(@RequestHeader(value = "store-id", required = false) String storeId,
-                                                          // @RequestHeader(value = "user-id", required = false) String userId,
+                                                           // @RequestHeader(value = "user-id", required = false) String userId,
                                                            @RequestParam(value = "communityId", required = false) String communityId,
                                                            @RequestParam(value = "objType") String objType,
                                                            @RequestParam(value = "qaId") String qaId,
@@ -279,7 +273,6 @@ public class QuestionAnswerApi {
         } else {
             questionAnswerTitleDto.setObjIds(new String[]{storeId, communityId});
         }
-
         return getQuestionAnswerTitleBMOImpl.get(questionAnswerTitleDto);
     }
 
@@ -293,13 +286,10 @@ public class QuestionAnswerApi {
      */
     @RequestMapping(value = "/saveQuestionAnswerTitleValue", method = RequestMethod.POST)
     public ResponseEntity<String> saveQuestionAnswerTitleValue(@RequestBody JSONObject reqJson) {
-
         Assert.hasKeyAndValue(reqJson, "titleId", "请求报文中未包含titleId");
         Assert.hasKeyAndValue(reqJson, "qaValue", "请求报文中未包含qaValue");
         Assert.hasKeyAndValue(reqJson, "objType", "请求报文中未包含objType");
         Assert.hasKeyAndValue(reqJson, "seq", "请求报文中未包含seq");
-
-
         QuestionAnswerTitleValuePo questionAnswerTitleValuePo = BeanConvertUtil.covertBean(reqJson, QuestionAnswerTitleValuePo.class);
         return saveQuestionAnswerTitleValueBMOImpl.save(questionAnswerTitleValuePo);
     }
@@ -314,14 +304,11 @@ public class QuestionAnswerApi {
      */
     @RequestMapping(value = "/updateQuestionAnswerTitleValue", method = RequestMethod.POST)
     public ResponseEntity<String> updateQuestionAnswerTitleValue(@RequestBody JSONObject reqJson) {
-
         Assert.hasKeyAndValue(reqJson, "titleId", "请求报文中未包含titleId");
         Assert.hasKeyAndValue(reqJson, "qaValue", "请求报文中未包含qaValue");
         Assert.hasKeyAndValue(reqJson, "objType", "请求报文中未包含objType");
         Assert.hasKeyAndValue(reqJson, "seq", "请求报文中未包含seq");
         Assert.hasKeyAndValue(reqJson, "valueId", "valueId不能为空");
-
-
         QuestionAnswerTitleValuePo questionAnswerTitleValuePo = BeanConvertUtil.covertBean(reqJson, QuestionAnswerTitleValuePo.class);
         return updateQuestionAnswerTitleValueBMOImpl.update(questionAnswerTitleValuePo);
     }
@@ -340,7 +327,6 @@ public class QuestionAnswerApi {
 
         Assert.hasKeyAndValue(reqJson, "valueId", "valueId不能为空");
 
-
         QuestionAnswerTitleValuePo questionAnswerTitleValuePo = BeanConvertUtil.covertBean(reqJson, QuestionAnswerTitleValuePo.class);
         return deleteQuestionAnswerTitleValueBMOImpl.delete(questionAnswerTitleValuePo);
     }
@@ -378,11 +364,11 @@ public class QuestionAnswerApi {
      */
     @RequestMapping(value = "/queryTitleValueResult", method = RequestMethod.GET)
     public ResponseEntity<String> queryTitleValueResult(@RequestHeader(value = "store-id") String storeId,
-                                                                @RequestParam(value = "communityId", required = false) String communityId,
-                                                                @RequestParam(value = "objType") String objType,
-                                                                @RequestParam(value = "titleId",required = false) String titleId,
-                                                                @RequestParam(value = "page") int page,
-                                                                @RequestParam(value = "row") int row) {
+                                                        @RequestParam(value = "communityId", required = false) String communityId,
+                                                        @RequestParam(value = "objType") String objType,
+                                                        @RequestParam(value = "titleId", required = false) String titleId,
+                                                        @RequestParam(value = "page") int page,
+                                                        @RequestParam(value = "row") int row) {
         QuestionAnswerTitleValueDto questionAnswerTitleValueDto = new QuestionAnswerTitleValueDto();
         questionAnswerTitleValueDto.setPage(page);
         questionAnswerTitleValueDto.setRow(row);

service-user/src/main/java/com/java110/user/dao/impl/QuestionAnswerServiceDaoImpl.java

@@ -3,13 +3,11 @@ package com.java110.user.dao.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.java110.utils.constant.ResponseConstant;
 import com.java110.utils.exception.DAOException;
-import com.java110.utils.util.DateUtil;
 import com.java110.core.base.dao.BaseServiceDao;
 import com.java110.user.dao.IQuestionAnswerServiceDao;
 import org.slf4j.Logger;
 import com.java110.core.log.LoggerFactory;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 import java.util.Map;
@@ -24,38 +22,36 @@ public class QuestionAnswerServiceDaoImpl extends BaseServiceDao implements IQue
 
     private static Logger logger = LoggerFactory.getLogger(QuestionAnswerServiceDaoImpl.class);
 
-
-
-
-
     /**
      * 保存答卷信息 到 instance
-     * @param info   bId 信息
+     *
+     * @param info bId 信息
      * @throws DAOException DAO异常
      */
     @Override
     public void saveQuestionAnswerInfo(Map info) throws DAOException {
-        logger.debug("保存答卷信息Instance 入参 info : {}",info);
+        logger.debug("保存答卷信息Instance 入参 info : {}", info);
 
-        int saveFlag = sqlSessionTemplate.insert("questionAnswerServiceDaoImpl.saveQuestionAnswerInfo",info);
+        int saveFlag = sqlSessionTemplate.insert("questionAnswerServiceDaoImpl.saveQuestionAnswerInfo", info);
 
-        if(saveFlag < 1){
-            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR,"保存答卷信息Instance数据失败："+ JSONObject.toJSONString(info));
+        if (saveFlag < 1) {
+            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR, "保存答卷信息Instance数据失败：" + JSONObject.toJSONString(info));
         }
     }
 
 
     /**
      * 查询答卷信息（instance）
+     *
      * @param info bId 信息
      * @return List<Map>
      * @throws DAOException DAO异常
      */
     @Override
     public List<Map> getQuestionAnswerInfo(Map info) throws DAOException {
-        logger.debug("查询答卷信息 入参 info : {}",info);
+        logger.debug("查询答卷信息 入参 info : {}", info);
 
-        List<Map> businessQuestionAnswerInfos = sqlSessionTemplate.selectList("questionAnswerServiceDaoImpl.getQuestionAnswerInfo",info);
+        List<Map> businessQuestionAnswerInfos = sqlSessionTemplate.selectList("questionAnswerServiceDaoImpl.getQuestionAnswerInfo", info);
 
         return businessQuestionAnswerInfos;
     }
@@ -63,28 +59,30 @@ public class QuestionAnswerServiceDaoImpl extends BaseServiceDao implements IQue
 
     /**
      * 修改答卷信息
+     *
      * @param info 修改信息
      * @throws DAOException DAO异常
      */
     @Override
     public void updateQuestionAnswerInfo(Map info) throws DAOException {
-        logger.debug("修改答卷信息Instance 入参 info : {}",info);
+        logger.debug("修改答卷信息Instance 入参 info : {}", info);
 
-        int saveFlag = sqlSessionTemplate.update("questionAnswerServiceDaoImpl.updateQuestionAnswerInfo",info);
+        int saveFlag = sqlSessionTemplate.update("questionAnswerServiceDaoImpl.updateQuestionAnswerInfo", info);
 
-        if(saveFlag < 1){
-            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR,"修改答卷信息Instance数据失败："+ JSONObject.toJSONString(info));
+        if (saveFlag < 1) {
+            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR, "修改答卷信息Instance数据失败：" + JSONObject.toJSONString(info));
         }
     }
 
-     /**
+    /**
      * 查询答卷数量
+     *
      * @param info 答卷信息
      * @return 答卷数量
      */
     @Override
     public int queryQuestionAnswersCount(Map info) {
-        logger.debug("查询答卷数据 入参 info : {}",info);
+        logger.debug("查询答卷数据 入参 info : {}", info);
 
         List<Map> businessQuestionAnswerInfos = sqlSessionTemplate.selectList("questionAnswerServiceDaoImpl.queryQuestionAnswersCount", info);
         if (businessQuestionAnswerInfos.size() < 1) {
@@ -94,5 +92,4 @@ public class QuestionAnswerServiceDaoImpl extends BaseServiceDao implements IQue
         return Integer.parseInt(businessQuestionAnswerInfos.get(0).get("count").toString());
     }
 
-
 }